Merge "Rename macros for (non)binderized HALs"