[automerger skipped] Merge "Use shared variant of VNDK libmedia_helper" am: cd6d4fc277 am: c527a74f0b -s ours

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

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

Change-Id: I0832909fb1a5475730a20c6345a8ddf0269a9854