Merge "more complete 64bit mediaserver build targets" am: 14dcc28c am: 1f3c103d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I49e19a3c7439f296e9cbb8e9a4da4c75585fe738