Merge "Add media/openmax as an include directory" into oc-mr1-dev am: 4af5a629c6 am: fad45d87ef
am: dba34b72c4

Change-Id: Ia5fe94501cad694ba37afe3a1d7017142e2db8ef