[automerger skipped] Merge "Camera: use proper input size in ZslProcessor"
am: 1cee38b7a1  -s ours

Change-Id: Ib796ff5f6a4afd8a9a08742c0dc380f10eb7e33f