Merge "hwc2: fix for accessing right buffer variable name"