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

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