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

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