[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 skip reason: Change-Id Ibc0e0eee46762dac2825f2ff4c2cf6dcbeaea320 with SHA-1 b1d46ad9 is in history

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

Change-Id: I54c8564fd3671ed2e776ce33b5b5443a5c74097a