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

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