Merge "Convert update_host_simulator to Android.bp" am: d3e4ee7b16 am: 1d5b35dfb5

Change-Id: I587f12b2efc027c7e3808a00744298623cb35e0b