Merge stage-aosp-master into pi-dev-plus-aosp

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