Merge "AAFcli.java-remove declaration of thrown exception"