Add CM Camera/Gallery support

Change-Id: Ib89a259515e5608986e9c0a2f4c99796d2bd2ed0