Merge "audio.*.default: remove unneeded dependency/IWYU" am: 15c75832fd
am: 74d5a357e3

Change-Id: I292bd87d9031c6b9f6fbd7daba12c25be6a1f8eb