[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
am: 40cad85af7  -s ours

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