Merge "Take a couple of wcs MTE patches from upstream FreeBSD."
am: 888903aa8a

Change-Id: I49a566b4a34236acf3e13088fbd9e35f0af2e02a