[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 5d87b11315  -s ours
am: 7a599dec84  -s ours

Change-Id: I98e80839dbf9902702dffef2df75bb9e9c86b3e0
tree: 2486236671ea805ec0fcaca310998c518634660f
  1. lib/
  2. test/
  3. tools/
  4. Android.bp
  5. LICENSE.TXT