Bugfix: This patch enables automount of usb sticks on serrano based devices
renamed sda into usbdisk

Change-Id: Ic802929660a31984d89e20bbb59667b1d8386f2e
serrano: Add noemulatedsd flag for external sd card

Change-Id: I4edb7a2549828fe4477da915bbe8dc86b1e9af62
Merge branch 'cm-11.0' into kk_mkt