Merge "Fix comile error for pixel aidl hwc"