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

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