Merge "Remove references to Google in Android keymaster."
tree: 1a4a89720fa3ed978bd5972a26a14e7e3f4a256c
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/