Temporarily disable HDMI sound out
Correct typo in variable name
Re-add defs for ADB compatibility