support both recovery paths: bootable/recovery and
bootable/recovery-twrp

Change-Id: Ia45e4abb4156f81406f7da7a7e521d1ab9353add