Merge "AAPT2: always compile 9patch files"