Merge "Camera: Bump camera splitter output slots" into pi-dev am: 6366070164
am: 819484f7b1

Change-Id: Ic6fe5056f4bb8ab211fde7743e6d5ec04cbb7188