Pull in some upstream fixes:
- Code typo, not required by I already pulled it into 16.x (efc5c73)
- Remove duplicated export map (a023b4e)
- Fix a bug where mesa and comgr causes a conflict when both installed, i.e. conflict with rocm-opencl and mesa-opencl (be38ca9)
Should work with ROCm 5.4
