Merge "Make EncodeDecodeTest aware of crop rects." into jb-mr2-dev