Merge "tests: Add testcase for ZipUtil." am: aa305e9ce8 am: 6df1c4579e
am: 830ab1c482

Change-Id: I253e34414b8fb4be173307ec0dabedb9c7f35380