Merge "Build 64-bit drmserver on 64-bit-only" am: dbb98950 am: 2137de3c...

Merge "Build 64-bit drmserver on 64-bit-only" am: dbb98950 am: 2137de3c am: f62ee019 am: 36c862a5 am: dd0e7ca1

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

Change-Id: I4322c7ac15b39400c8460d635053ca50a9c738f0