Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master
tree: 004f9a297e2138ac3b087e0e1a799d996837a741
  1. Android.bp
  2. AndroidManifest.xml
  3. OWNERS
  4. src/