Merge "ART: Fix stub_test"