[automerger skipped] Merge "Add required sphal back to swcodec APEX - DO NOT...

[automerger skipped] Merge "Add required sphal back to swcodec APEX - DO NOT MERGE" am: 10fd4b5f -s ours am: 109082b3 -s ours am: be5d0c01 -s ours am: 9f362a6f -s ours am: a0296021 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ic4792126e1527b178e8fbb7c16518b47e4a79c33