DO NOT MERGE - ACodec: Save and use the previous crop rectangle. am: 07d73a0a3f
am: 5e523ead5a

Change-Id: Ie68d73caa56740f8d9273acd3a5888266092a3d4