Merge "Remove unused cruft from libcutils."