Merge "Add sh_test_host." am: 94e90c696e
am: 54a8a8ce0c

Change-Id: Icd01f843aca323ed0bc81bcb16558b42ca0036d1