Use CM camera also.

Change-Id: I7884ce5809aeddf91056c4ec1f2f693ef8d0b577
Merge "Use CM camera also." into jb2