Mattiwatti Fix build with current EDK2 master