Fix sdcard mounting

Change-Id: I340c66636a5b85222b0e5bed7e476b5c4ba07625
Merge "Fix sdcard mounting" into cm-11.0