Merge "Add libcutils_test into TEST_MAPPING"