Merge "Change the default multilib for host libraries to "both""