Merge "Use shared version of vndk libmedia_helper"