serrano: Swap adb and mass_storage order in recovery init

Change-Id: I3533b8382041bee4c36b6d8dde917585447acd23
serrano: Add serranoltespr to build barrier

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