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

* commit '45c4c06ffe6f38e0f77f37f488e07f2537eddd45':
  Remove unused cruft from libcutils.