Merge "MediaCodec/Image: handle null cropRect correctly"