fix compiler warning

Change-Id: Id552abe520856cc651582476b192d0fefa76b6d3
Fix mass storage in recovery

The proper order is mass_storage,adb. Some systems cannot recognize
the mass storage otherwise.

Change-Id: I7e240210adef52de70776353a3426e3fc3f1b5bc
Merge "Fix mass storage in recovery" into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0