Merge stage-aosp-master into pi-dev-plus-aosp
am: 00d234ee20

Change-Id: I50727bf8e9eba5a09a1ec4bf6310b5153405095a
tree: 3efeffb4c7636ced0350e0981a557fc306036f4a
  1. Android.bp
  2. AndroidManifest.xml
  3. CleanSpec.mk
  4. OWNERS
  5. res/
  6. src/