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

Change-Id: I315f2f2c648a15786937aeae68a530390433d0ba