Merge "Camera: Add MONOCHROME capability" into pi-dev am: 782f001780
am: 479eec6bbd

Change-Id: Ic3c6f746bb7e3d0802b71cc49bb6d661b1259d61