Merge "Remove dependency on libcutils"
am: 4ac1829d7e

Change-Id: I6310b0ce5c228fc1caacc93c14f4ddc5d73c5c82