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

* commit '8fee1a5ae5cea6f5eaf5d29a2e8793122df6c7a3':