Merge "AAPT2: Fix mkdirs implementation"