am ab8a3590: Merge "Revert "Extra audio headers for better build-time compatibility""

* commit 'ab8a35906f6ed5055a0a6c52db4d5cb154cdf703':
  Revert "Extra audio headers for better build-time compatibility"