Merge stage-aosp-master into pi-dev-plus-aosp

Bug: 126125118
Change-Id: Id6a1cdecf398735c795629d4ec1bb3aa9315bf84
tree: e17094b6fda7f5aefb3a2b1446f90d0983226b04
  1. src/
  2. Android.bp
  3. AndroidManifest.xml
  4. CleanSpec.mk
  5. OWNERS
  6. proguard.flags