Fix compile w/ ex-liquid kernel, and vanirify

Change-Id: Iec744339e420a995b8e25fe017a2356fff748a8d