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

Change-Id: I9d3a07c674833fe396ebc1525981132c488365be