Merge commit 'fc69910f329d' into uaccess.mips

backmerge of a build fix from mainline