serrano: Remove usbdisk from SECONDARY_STORAGE

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