Merge "OMX: Ensure nStride, if very negative, does not cause an overflow"