Merge "AAPT2: Fix GetFileType for unicode and long paths on Windows"