Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: a18ca90b02

Change-Id: I77b02bbd1748e9f04feb51456567e0f509d32d77
tree: ed9d79c5056156a683b34ac37e7821e876f225c4
  1. keystore/
  2. keystore-engine/
  3. Android.bp
  4. MODULE_LICENSE_APACHE2
  5. NOTICE
  6. OWNERS