Add waldi and switch to TWRP

Change-Id: If0941ac1b669cdbd4feac37f3eb4a6309817cfad