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

Change-Id: I9f2d07ac5b9f2c6997ee47e647650cc731f87e6e