Merge "libmedia_helper export headers"