am 9d33b777: am 8a8953bb: (-s ours) Fix libcutils build.

* commit '9d33b7773f665ff20f43c13f00688efcd496ba94':
  Fix libcutils build.