am df8bf90c: am 58774cf3: Merge "camera2-portability: Touch-to-focus accounting for effective crop" into lmp-dev * commit 'df8bf90c':