Merge "Replace _host suffix with more standard -host suffix."
am: f020dde748

* commit 'f020dde748812993692311aa91e3fe39141f56ee':
  Replace _host suffix with more standard -host suffix.