am b9ede405: am 4ec565ff: Merge "ART: Fix stub_test"

* commit 'b9ede40590261f5ceca6b2dec4738eb53171b1a8':
  ART: Fix stub_test