am d9141d93: am d292f790: Merge "Reconcile differences between zip implementations" into klp-dev
am d9141d93: am d292f790: Merge "Reconcile differences between zip implementations" into klp-dev

* commit 'd9141d939eff2e53c95f92a6a2c34116fd7a868b':
  Reconcile differences between zip implementations

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base