Merge "[aapt2] Fix infinite loop in proguard::CollectLocations" am: 39146bcc18
am: b9150119f8

Change-Id: I6cd248db327a66c74a39165ebc8145ce90afc5b4