Android m preview
Merge "Clean up Keystore compilation"