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

Change-Id: I2b7750bfe3e00eacb8952cd180cf66faff099e09