Use our mix of CM and Linaro's cameras

Change-Id: Iade1e51acf52cad83715f376c49f1ee137c686e8