Merge "AAPT2: Introduce notion of 'product' to ResourceTable" into nyc-dev