Merge "Drop the device specific support for update host simulator" am: fc2ad88770 am: 79e4e39be6
am: fd4d891c22

Change-Id: I5d3acd33483390791ab97af31cb973bab2e19358