Fix whitespace after including a mixin (#12715)

Change-Id: I9b25968cc140a9443820a26eadb6b5a1507ad7ec