Merge "mm-core: synchronize OpenMax headers with AOSP counterparts"