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

Bug: 120848293
Change-Id: I3149542d902e857c83935b04148fdc12fc36252a
tree: c7e818e81de15fc5bf5871ff28275cd5fe62bb2a
  1. src/
  2. Android.bp
  3. apkzlib.iml
  4. BUILD
  5. build.gradle
  6. OWNERS