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

Change-Id: Ia386bff12bd9c73279c50efec468172a8a76e620