am ad6731b0: Merge "Add debugging to ZipFileRO" into gingerbread

Merge commit 'ad6731b0fc759e446504bca163d8fd2fb6326577' into gingerbread-plus-aosp

* commit 'ad6731b0fc759e446504bca163d8fd2fb6326577':
  Add debugging to ZipFileRO