am cf29e3a2: am bc73a5ab: am f608db22: Merge "mako: remove usb.host feature" into jb-mr1-dev

* commit 'cf29e3a2db91ef73d96a74463d4133e38dabf134':
  mako: remove usb.host feature