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

Change-Id: Ib73f411712bf271f115a463edf55189f38c7bae2