Merge "Update .hal file for fixing vts tests" am: 4771c35ba9 am: bb46c20ae5
am: e77924cc09

Change-Id: I903e1b9ce4b9f6d34702161292840280c3eb1301