Merge "Add libcutils_test into TEST_MAPPING"
am: 7f44a83d8f

Change-Id: I04fa2774b20bf3a16e2717b515331952f3df3458