am 25f5108f: am adf87b0c: Merge "ART: Fix a failing gtest"

* commit '25f5108f27bb8ef25764bcc85533f32a42f920d4':
  ART: Fix a failing gtest