Merge "AAPT2: Fix product support"