Merge "libmediandk: map remove extra '#'" into main am: a9ab102c am: 15f94806 am: 52b0e979

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



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