Merge "Use shared version of vndk libmedia_helper" am: deb0edbe3a am: 1f95cfe12e
am: 738edce4ac

Change-Id: Ic2a698b04ce0ca812edf8397bd835dd235a62eb9