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

* commit '76b561772729144f63681a69143c85a836723765':
  ART: Fix a failing gtest