Merge "Don't include ithread.h in decoder omx wrappers"