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

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