Merge "Camera: Add MONOCHROME camera capability" into pi-dev am: 889b21d181
am: aa306f2788

Change-Id: Ic76dac7d28f89bb070321430710c9871c3167857