Merge "Remove unused link to libcutils"