Merge stage-aosp-master to aosp-master - DO NOT MERGE

Change-Id: Ifcd87eaf20d5a14bc1a67bfc837900818cef4641
tree: 25262c115ee53a0576886637b8acbe386033a1c6
  1. Android.bp
  2. AndroidManifest.xml
  3. OWNERS
  4. src/