Merge "Add lshal support for VrHwc"