Camera: set mNumberOfNormalCameras correctly am: 6dd6c54651 am: 72bc40dc51
am: 6258d848c5

* commit '6258d848c52d36e804977c3007a968ad823b9244':
  Camera: set mNumberOfNormalCameras correctly