Merge "remove redundant symbols" am: 5d97c760 am: a0876138 am: 3899552d am: 473abb24

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



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