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

Change-Id: Id527dda7c0805c72c0785427e7e6f318e825975a