Merge "Correct crop size for software encoders" am: e1fc4f5c am: 708cff1e...

Merge "Correct crop size for software encoders" am: e1fc4f5c am: 708cff1e am: 49838048 am: 449ab2fe

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2211276



Change-Id: I211945d023204c025cdb66fb6a7ea7d50ccbc4fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>