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

* commit 'adf87b0c8cd68ed365e01aec620d016493357cec':
  ART: Fix a failing gtest