Merge "Add vendor override property to fake VHAL hardware."