Merge stage-aosp-master into pi-dev-plus-aosp
am: c400ec7efc

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