Add waldi and switch to TWRP

Change-Id: If0941ac1b669cdbd4feac37f3eb4a6309817cfad
Clean up gps.conf a bit

Change-Id: Iea602ee0770552deb0b548bcad2dee955518f242