Revert "hal: update combo device handling"

This reverts commit 993e1f42e79729da2cd80df56072f954ad666b42.

Change-Id: I758f222fdb861feb730b7caba1416ba2e393b5b7
10 files changed