Merge "hwc2: Add support for HDR and HWC tonemapping"