Merge "Add debugging to ZipFileRO" into gingerbread