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

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