B&N mmc recover changes

This should help a bit with sdcards being flakey, but in reality does not seem
to help all that much

Change-Id: I1139b98f188a4faf775ae4cd2e604161d62acb2c
Merge "B&N mmc recover changes" into cm-11.0