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

Change-Id: I89f8934d463532b498216b636ab1d03463d5692a