Merge "Allow OMX pointer types to be forced to 32 bits"