DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: Ic02c06056be42fb8738c18c37fe2db38da1747a1
tree: c95c0943b67ec5c458a51b51f11e82cac5315206
  1. 1.1/
  2. extns/
  3. halimpl/
  4. Android.bp
  5. OWNERS