Cherry pick OMX patch - android_frameworks_base