Merge "openmax header files have been relocated" am: 8e0f8836d9
am: 3794336021

Change-Id: I1a1fa65280343197f2dbc100b56153b028ea0adf