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

Change-Id: Ie847557d1040a9fd8acae656c3a45de96d5ad2d5