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

Change-Id: Ie84c255622923029ba546683274c76c7d3aa7ec6