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