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

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