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

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

Change-Id: I0e43ae25b61d784d6337595c901e0de181b0133e