Merge "Default LOCAL_MULTILIB:=both for HOST_NATIVE_TEST"
am: d52953e9ed

* commit 'd52953e9ed3a9625a61548234575acd4f0bbe87a':
  Default LOCAL_MULTILIB:=both for HOST_NATIVE_TEST