Merge "Clean up Keystore compilation"