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

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

Change-Id: Ia92b09161aa1a332aaa1a761cc06d8e1cfef3455