Merge "Fix VTS for VehicleHal" into qt-dev
am: 37d4bdb49e

Change-Id: Ie47e267c671ce5448c97dfeb1d511f74c43fdba4