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

Change-Id: I69c70a1b7ccc3318a29fe10e9ff379126091b79b