[automerger skipped] RELAND "codec2 hal: move directories around" am:...

[automerger skipped] RELAND "codec2 hal: move directories around" am: e887d670 am: fe1eb808 -s ours am: d7d11729 -s ours am: 094d0e78 -s ours

am skip reason: Merged-In I2667b6f5d1c962e07fee54e2839b62721dc8e655 with SHA-1 3d6ffef6 is already in history

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



Change-Id: I08b3372285f85b6a2d3547e2bdec83566fc7844d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>