Merge "Fix keytool invocation"