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

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