do not merge: cherry-pick of c2d666bd4f6eb5f7a9f17b10435c161cb105b7c5 from master
do not merge: cherry-pick of c2d666bd4f6eb5f7a9f17b10435c161cb105b7c5 from master

Plain-Andy/android_platform_bootable_recovery,InsomniaAOSP/platform_bootable_recovery,randomblame/bootable_recovery,randomblame/bootable_recovery,InsomniaAOSP/platform_bootable_recovery,DerTeufel/dualboot_recovery,kylinmoddev/android_bootable_recovery,randomblame/bootable_recovery,DerTeufel/dualboot_recovery,kylinmoddev/android_bootable_recovery,Plain-Andy/android_platform_bootable_recovery,76Demented/bootable_recovery-,76Demented/bootable_recovery-,76Demented/bootable_recovery-,DerTeufel/dualboot_recovery,76Demented/bootable_recovery-,76Demented/bootable_recovery-,DerTeufel/dualboot_recovery,InsomniaAOSP/platform_bootable_recovery,Plain-Andy/android_platform_bootable_recovery,kylinmoddev/android_bootable_recovery,randomblame/bootable_recovery,DerTeufel/dualboot_recovery,InsomniaAOSP/platform_bootable_recovery,randomblame/bootable_recovery,Plain-Andy/android_platform_bootable_recovery,kylinmoddev/android_bootable_recovery,InsomniaAOSP/platform_bootable_recovery