Merge "Use shared variant of VNDK libmedia_helper" am: cd6d4fc277

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

Change-Id: I9acfd2d948cda3d4db46cff370e475cd809effbf