Merge "Make sure all HWC2 functionality is ifdef'd" into oc-dev