Android CTS 7.0 Release 24 (4890522)
Merge "Replace _host suffix with more standard -host suffix." am: f020dde748
am: dc0f76dbd1

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