Merge commit 'linux-user/linux-user-for-upstream' into tmp-staging