Merge "Merge \\"media: document output image crop and layout for MediaCodec\\" into nyc-dev am: 939484b8ab am: 153d6e5531" into nyc-mr1-dev-plus-aosp