Merge "Revert "add host unit tests"" am: 65c8e37c8c am: d9bf9d12df
am: 5bd188fdbf

Change-Id: I9012be94e23787b8f6b59d5035d9ac6a24f435d1