Merge "AAPT2: Fix issue where exported symbols (@+id/*) were not exported"