Merge "Fix bug 35841603: updating zip with invalid extra" into studio-master-dev am: 9a5309c7a2
am: df3747fbba

Change-Id: I9363aaf03f110675c6f4f747cac9bcef9ed920ff
tree: 74eed5ea9016f8405336f92b57adc49ee16272f0
  1. src/
  2. apkzlib.iml
  3. BUILD
  4. build.gradle