Merge "Use shared version of vndk libmedia_helper"
am: deb0edbe3a

Change-Id: I7c842647470af71c25232254df23d2165f257957