[automerger skipped] Merge "Use shared variant of VNDK libmedia_helper" am:...

[automerger skipped] Merge "Use shared variant of VNDK libmedia_helper" am: cd6d4fc2 am: c527a74f -s ours am: 33780174 -s ours am: 3f213994 -s ours am: 70de2b62 -s ours

am skip reason: Change-Id I56ad69125811ff768d8064af34acf5603b575b4b with SHA-1 d6db130a is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1367606

Change-Id: I5ac4a359f9adad8aa591b8ba8a7732096d9aae01