[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
am: bcc9ab996f  -s ours

Change-Id: I367de790f370192c64db534f5777cc3367d63154
tree: cbc3ef3260d4a281e0dc86a38da88b8b219f1b87
  1. Android.bp
  2. CleanSpec.mk
  3. src/