Merge "AAPT2: Enable product/config filtering and improve source ordering" into nyc-dev