Merge "Revert "Revert "Use libziparchive for dalvik zip processing."""