Merge "AAPT2: Fix windows unicode path issues"