Merge "Support dynamic 64-bit media service" am: b80ffdeb am: d93e16b7 am:...

Merge "Support dynamic 64-bit media service" am: b80ffdeb am: d93e16b7 am: 4ab06a6f am: 24a17917

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



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