Merge stage-aosp-master into pi-dev-plus-aosp
am: 45645b316c

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