Merge "Switch to zip64 in recovery"