TWRP: Cleanup for recent TWRP commits/patches
TWRP: Include crypto flag