[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: e9dd012728  -s ours
am: 7fb51e8b06  -s ours

Change-Id: I79ba1ac7886031a6a4d59f4462624f130e8566d6
tree: f3afed1b70d82e5e87911e3a0e1cb6a2d87231f5
  1. include/
  2. lib/
  3. templates/
  4. tools/
  5. unittests/
  6. Android.bp
  7. LICENSE.TXT
  8. OWNERS