Merge "Unify hwc2_device_t and HWComposer."