am 0c9c5bbd: Merge "ART: Fix stub_test"

* commit '0c9c5bbdd6976c21602b92d9b455e6fe5d769fb0':
  ART: Fix stub_test