[automerger skipped] Merge "more complete 64bit mediaserver build targets" am:...

[automerger skipped] Merge "more complete 64bit mediaserver build targets" am: 14dcc28c am: 1f3c103d am: b73a1154 -s ours am: 7d48a358 -s ours

am skip reason: Change-Id If625b33f29f467ee111a8ec675b855322d26b5b2 with SHA-1 df488fea is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8bafd1261beda4bc89f5fed3e0fa6568e21cc826