Merge "OMX CallbackDispatcher uses C++ Thread not pthread"