Manually merge changes from giant AOSP topic

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