ROMControl: Sound - Fix Headphone/Bluetooth

JB-MR2 bring-up.
NEEDED && Verified.
Merge.

Change-Id: I586317c48cdcb3d5cee49b8348ef4c0c40d5acf5