am 252eb847: am e88d7fe6: am 6c5cc576: Merge "camera2: Add state machine for doing auto-focus easily from apps" into klp-dev

* commit '252eb8479f17e384da1321a5fb974f5eb87dbb12':