camera: cleanup urushi torch a bit

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: I1990ddfbcf2f1b9109b8e4cd193181174d3f2bd7
camera: no need to override scene modes yet

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: I38f9ec78fc863fe7ad15fc2fa6baaa0a32fd146e