Merge "mediaserver: add instructions for switching to 64 bit" into sc-dev am: c5bc7038 am: a28e9136

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

Change-Id: I26373099dd885b227ace2ffd0d54af9d2426dd8a