Merge "galaxys2: Fix the inability to mount/unmount sdcard" into cm-11.0