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

Change-Id: I60e470c50af361f2a7834a7dbdd63d8449186beb