am 7c2bfaf3: Merge "Change the default multilib for host libraries to "both""

* commit '7c2bfaf32959b3a9ebe5e59ac3734dfb36ca8bb0':
  Change the default multilib for host libraries to "both"