[automerger skipped] Merge "more complete 64bit mediaserver build targets" am: 14dcc28c77 am: 1f3c103d55 am: b73a1154b3 -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I54a9270c1eb15dcbf9ac52651cffc4a39d69dd0b