Merge "Work around a art test script bug mixing up bootclasspaths."