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

Change-Id: I582c2e72d7dc125b80215df0d00b4570b046a083