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