Merge "supplicant(vts): Compilation fixes" into oc-dev
am: c499fd869b

Change-Id: Ic0706b56690bf4a45a847b73aa3b537d478cfa33