Followup to Bug 1041085 - Fix FM RDS HAL code on non-unified builds