Merge commit '5c5be2499f25853d0af2154862e648a10da2e4c6' * commit '5c5be2499f25853d0af2154862e648a10da2e4c6': Add focus API and FLASH_MODE_VIDEO_LIGHT.
Merge commit '5c5be2499f25853d0af2154862e648a10da2e4c6' * commit '5c5be2499f25853d0af2154862e648a10da2e4c6': Add focus API and FLASH_MODE_VIDEO_LIGHT.