Merge "Add libcutils_test into TEST_MAPPING" am: 7f44a83d8f am: cb00f46509
am: f3ebbec1b8

Change-Id: Id0ce7569a6a3c5fe4fdab08ff624c38998a12819