Merge "Fix libmedia_helper dependencies." into oc-dr1-dev
am: 76229a8e73

Change-Id: I10cfb722ca6fb011858cc5146d18f74af19db2cd