Merge "Remove BCM_STR* macros"