Merge "Use cc_test, not art_cc_test."
am: 9e03e1d2dc

Change-Id: I6731d8d1826f1b8dcea6353ca21f361665dd963e