[automerger skipped] Merge "audioserver: Makefile - remove unused entries"...

[automerger skipped] Merge "audioserver: Makefile - remove unused entries" into main am: cf076344 -s ours am: 83cdcca3 -s ours

am skip reason: Merged-In I84537d88ae93f15748ae4ee2833c41ac7a669b3a with SHA-1 a040aecc is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3216072



Change-Id: I2c9b341e6636204a8d62ad04f70fb4a176d4a4f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>