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

Change-Id: I14069e22cfd002cd348804ca50444f4377aa49af