Merge "AAPT2: Fix overlay support"