Make the OS choice a combobox

Change-Id: Ie10d8f01b847f868e2a8d5afae8b313de3a98d91