Merge "Use cc_test, not art_cc_test."