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

* commit '5a204d1d31bdb17ea2f7425cc06f1b98acaf6c17':
  Default LOCAL_MULTILIB:=both for HOST_NATIVE_TEST