Show "Eject card" for usb storage

Readd the "Eject" options if the SD card is mounted via usb.

Change-Id: I802cf4d20eb3b45ce068f89c22352f79999d593e
Settings: Use consistent title for button wake up

Following http://review.cyanogenmod.org/63421

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

Conflicts:
	res/values/cm_strings.xml

Change-Id: I4e55fa912d7b2d2dc2ea3e4c713a89249915b309