Revert "Revert "Camera: add support for cm camera""

This reverts commit dc72bb3bb00e19a3fb3072cdd201c928a2e5932e.
Remove duplicate

Change-Id: I34a855dd1ffd65ebe06e74eb63e0d6e70689d056