Merge "Support dynamic 64-bit drmserver" am: 2327ba2d7a

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

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