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

Change-Id: Ida439dc9fde87cdad2ac1e43e25668f871d6ece4