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

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



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