Merge commit 'fe1a86df8b1c23e3290f96dce69984bf979a462b' into eclair-plus-aosp * commit 'fe1a86df8b1c23e3290f96dce69984bf979a462b': Change FLASH_MODE_VIDEO_LIGHT to FLASH_MODE_TORCH.
Merge commit 'fe1a86df8b1c23e3290f96dce69984bf979a462b' into eclair-plus-aosp * commit 'fe1a86df8b1c23e3290f96dce69984bf979a462b': Change FLASH_MODE_VIDEO_LIGHT to FLASH_MODE_TORCH.