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

Change-Id: I144ef816f8b942a95b9756b172c2d8e727c0b4a2