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

Change-Id: I45574596c210e8ea38266c4cdb06ebc854713011