Merging from ab/5068661

BUG: 117514054
Test: TH
Change-Id: I2fe8bc306369d45939b50d21aa6516882ca0d049
tree: 939cb89f49f840f04cbc4ddde75333ccf06b0d1f
  1. .gitignore
  2. host/