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

* commit 'b94757d81034d61d0a5be20582cf72394d844ae5':