Merge "sdm: Fix hwc2 compilation"