Merge "AAPT2: Fix up file IO"