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

Change-Id: Idf24dc3a136d973ec1885bbf8ac7b35066c125bf