Merge "Remove build dependency of surfaceflinger on libinput" into main