Merge "Default LOCAL_MULTILIB:=both for HOST_NATIVE_TEST"