Merge "hal: Add changes to support scuba sound card"