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

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

Change-Id: Iae8de740c75d3f42d94e9a41b803c40424007510