Android 7.1.0 release 7
Replace _host suffix with more standard -host suffix.
am: 6bbf89bfc6

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