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

Change-Id: I4a5c883d59c830d20270a6d6622ac2dd9051226d