Merge "Build 64-bit mediaserver on 64-bit-only" am: b29806e2f6 am: 13de788c0b

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

Change-Id: I630ba2271348774d2d3f96ebffc2e918b2e2cd18