DO NOT MERGE - ACodec: Save and use the previous crop rectangle. am:...
DO NOT MERGE - ACodec: Save and use the previous crop rectangle. am: 07d73a0a am: 5e523ead am: 599dd8a6 am: 4160e8dd -s ours am: 04aeacbb
am: eb8a0101
Change-Id: Ie7cb6e4403975460d4e532432de2d16f08ba1353