Merge "Fix includes for MTE builds." am: 5b9cc31442 am: ed09b0d47c

Change-Id: Iadf1fb2dda94d3dd4fb17b2c7f3d054d460772f6