Merge "AAPT2: Fix windows multiple directory creation"