Little things for virator and surfing

Too small for me to import the entire LG commit
and also a had to trash a ton of it because it
used removed code. Mostly just ifndefs

Change-Id: I3533972ed81d1a4a0b372669f7ad29e15f2a51bb