am e3193479: am 47050dc6: Merge "Extra audio headers for better build-time compatibility"

* commit 'e3193479ae0ab05ceb149a186861621eb33ebb74':
  Extra audio headers for better build-time compatibility