am 1174dfe1: am e2f654a4: Merge "ART: Fix wrong CHECK in GetCurrentLocationForThrow"

* commit '1174dfe12410e9c864113d5c3d0a4bab4482c1e3':
  ART: Fix wrong CHECK in GetCurrentLocationForThrow