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

[automerger skipped] Add required sphal back to swcodec APEX - DO NOT MERGE am: ebaa8872 -s ours am: 5d0ca1cb -s ours am: 0ddf4d6f -s ours

am skip reason: Change-Id Ibc0e0eee46762dac2825f2ff4c2cf6dcbeaea320 with SHA-1 b1d46ad9 is in history

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

Change-Id: Ibe266f5196c2d25959f8161096d93e55b8c12f14