Revert "hal: Don't mess with primary output"

This reverts commit fc56491ce39b1ee499c69ec25f88d2e3a0fe2b72.

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