Merge "Remove dependency on libcutils"