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

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

Change-Id: Icc03021cca505ac7cfa5cf87d7981fe825e9f36d