am bb604524: am 45c4c06f: Merge "Remove unused cruft from libcutils."

* commit 'bb604524fb6d72e7ab9d32c705156561e8c7d251':
  Remove unused cruft from libcutils.