Merge "Remove references to Google in Android keymaster." into mnc-dev
tree: 0e4b2d892a6af24a8cd5be3a66033f0490c1df37
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/