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

Change-Id: Ice016e975e617026295688eee78f19bb00068907