hh: Collapse primary audio outputs

 * These are exactly the same. Just OR the flags together instead of
   confusing the HAL.
 * This appears to fix the occasional crackle on low-latency streams
   on other devices, so adding it here.

Change-Id: Id27093a09e6d0e296714221eae9f59f6d431f758
Merge branch 'cm' into HEAD