am 4ec565ff: Merge "ART: Fix stub_test"

* commit '4ec565ff67376893726f8472a3db618ada78573e':
  ART: Fix stub_test