[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 9e649433ae  -s ours
am: 36e628402a  -s ours

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