Merge branch 'cm-10.2' of github.com:CyanogenMod/android_bootable_recovery into devil_touch2