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

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

Change-Id: I3b6fef50c104eeec9c2007a986cf78ab083536ee