Merge RP1A.200507.001

Change-Id: Ibc58f176423dceee1472071ebfff6cc2b67a064e
tree: 12ebe2b71a6125b4e154b011283d4e69127fb91e
  1. src/
  2. Android.bp