Linaro Fix

Change-Id: I2f60739141d91c9fa8ab53fd0bd141b965d3d5d4
Merge branch 'cm-10.2' of https://github.com/CyanogenMod/android_bootable_recovery into DJL10.2
Merge branch 'cm-10.2' of https://github.com/CyanogenMod/android_bootable_recovery into DJL10.2
Merge remote-tracking branch 'djl/DJL10.2' into cm-10.2