am 7c43af0f: am c6e949a6: Merge "Switch to shared libcutils on host to fix odr-violation"

* commit '7c43af0fae57a9532ebde8bf81679f57fdb7e10b':
  Switch to shared libcutils on host to fix odr-violation