Merge "ZipUtils: Fix wrong timestamps when getEntryInfo am: 7134ce3 am: e9ff6d9" into nyc-mr1-dev-plus-aosp