Merge "AAPT2: Keep file enumeration consistent across platforms"