sdcard: fix usage for -w and -s options

Change-Id: I0ef4299d2ccf99a18970f02d4bd4e7c28dc5335e
Merge remote-tracking branch 'cm/cm-11.0' into HEAD