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

Change-Id: I66f14b8e59929d80d300d5c811ebf50b6f3bd4a6