Merge "Build 64-bit drmserver on 64-bit-only" am: dbb9895007 am: 2137de3cbe

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

Change-Id: Ia2a980692889067e2dea82beacfff0e886dbf826