Merge stage-aosp-master into pi-dev-plus-aosp
am: 5a868db195

Change-Id: Ie60d13f5220180b40fbd7b5f2eeb163cea48bfa1
tree: 31410771c98825bc1577deab0e160b868ac078ad
  1. Android.bp
  2. AndroidManifest.xml
  3. CleanSpec.mk
  4. OWNERS
  5. res/