Merge "mmc: Cleanup mmc code and unify mbr and gpt"