[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
am: 053975dd5a -s ours
am skip reason: subject contains skip directive

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