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

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

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