Merge "Remove dependency on libcutils" am: 4ac1829d7e am: 2c17cca557
am: ca3916b056

Change-Id: I43ad21d0cd6a88e8288328e2da297d3323312a74