Merge "audioserver: Makefile - remove unused entries" into main