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

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