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