[automerger skipped] Audio: Build file updates am: a8814e51 am: c08a0f2c...

[automerger skipped] Audio: Build file updates am: a8814e51 am: c08a0f2c am: 3d1f3dab am: e4e1d96e -s ours

am skip reason: Change-Id I6c891893398617a36f4748f185e189064ba4d4ee with SHA-1 6cd03bfd is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1475341

Change-Id: Ic9999d51c3788b4cd539d0dad29e961fba6c5ffe