Merge "AAPT2: Support -c configuration filtering"