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

Change-Id: I7f2d9bab325d724fb9ffeb440cec5b453a2d5fa1