mmc: Revert all changes for now.

Change-Id: Id8c3eeeaf58fd288d7799a26304f52feff9f8e44
Merge branch 'cm-11.0' into kk_mkt