Merge "plat/intel: Fix SMPLSEL for MMC" into integration