Merge branch 'linux-user-for-upstream' of git://git.linaro.org/people/rikuvoipio...