Fix twrp building and a wifi derp

Change-Id: Ibd6190307fbd665f6dc3cdf227e256ea25d19fa6