Merge "Binder: migrate off libbase macros" into main