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

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

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



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