Merge "AAPT2: Fix resource type id symbol merging"