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

Change-Id: If29fb74b30832e47f207a26d1d6a00fd11714569