Merge "Add media/openmax as an include directory" into oc-mr1-dev