Merge "Revert "add host unit tests""
am: 65c8e37c8c

Change-Id: Ic9cfb8c4598f9c138663f29b14b9d2757eaac72c