Merge "AAPT2: Fix a bug where files would only show up for one config"