Merge "binder: remove dead logging code" into main