[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 8449ca3050  -s ours
am: d0bc607857  -s ours

Change-Id: I0b6b3ea67928a1064ff3213c14895299f405ada9
tree: 27c62271a6eee4d0563cf5392591caac337f3137
  1. android/
  2. dist/
  3. Android.bp
  4. CleanSpec.mk
  5. OWNERS
  6. README.version