Merge "Use shared variant of VNDK libmedia_helper"