Merge "libcutils: remove rather than fix the mutex."