Merge "tests: Add testcase for ZipUtil."
am: aa305e9ce8

Change-Id: Id12e27ac3db4bcee6aa9de86867f05942cee3645