Merge "AAPT2: Add <overlayable> tag support"