Merge "Revert "Do a version bump of media and media.swcodec apexes"" into...

Merge "Revert "Do a version bump of media and media.swcodec apexes"" into sc-dev am: 3e3b2182 am: df0e91c6 am: 83541521

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

Change-Id: I3dc9227284a4dbc482db49f4200d6b319e8172d7