Merge "ART: Fix wrong CHECK in GetCurrentLocationForThrow"