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

* commit 'f482aaf72e86189c78c1c11bf03d165bf0dd1ecc':

Change-Id: I1d0b65f06c886b715754f6399dff303bdbd40ab2