Merge "Add back libcutils dependency."