Merge "Support dynamic 64-bit drmserver" am: 2327ba2d am: 9cc09a1f am: eea3cdbf

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



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