Merge "sdm:hwc2: Add buffer map to tonemap output buffer"