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

Change-Id: Ie3f7efc88e930b9bea05d5cacf0a6a700e891ab0