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