Merge "Camera: Fix off-by-1 error for scaling crop region" into rvc-dev am: 26f937a4c2 am: 6b78f75f8c am: 3e730887df

Change-Id: I11e4e01831e7e64c6f227a4b40e5cccca775b1a0