Merge "audio hal: explicitly import headers" into oc-dev