am 67496a60: am 3ffd5d43: Merge changes I0878a9f8,I1011252e into ics-mr1

* commit '67496a60c60076166f6856431f68024a9412c067':
  CameraHAL: Perform focus even if CAF has failed
  CameraHAL: Enable LDCNSF for Video snapshot