Merge "[aapt2] Ensure all zip entry times are the same" into main