Merge "Adjust file reference type in 'aapt2 convert'"