Change to cm cam and change how htc repo was set up.

Change-Id: I69509342b312331f91138a9d4728f0c0825a2c07