am e8621534: Merge "ZipUtilsRO rewrite based on Dalvik Zip rewrite" into kraken