Merge "hal: Audio HAL / APM changes for HDMI passthrough"