root: Don't export usbdisk as SECONDARY_STORAGE, not always there

Change-Id: Ied4de53693c383244f234a1f0d5135c56583bea2
Merge branch 'cm-11.0' into martincz