Merge change I155e2ad0 into eclair-mr2

* changes:
  Re-enable CameraSource.