am 7a37f156: am 47c32055: Merge "Make EncodeDecodeTest aware of crop rects." into jb-mr2-dev

* commit '7a37f156939afe82cb9e37fbb72db58e01063a31':
  Make EncodeDecodeTest aware of crop rects.