Merge branch '1163-clean-up-leftover-16-bit-hrtf-rom-switches' into...

Merge branch '1163-clean-up-leftover-16-bit-hrtf-rom-switches' into 1150-hrtf-rom-tables-should-be-defined-as-const and fix crend const declarations