Merge "Add test-art-oat-<test> test-art-run-test-<test> variants" into dalvik-dev