Merge "camera2-portability: Switch to ratio-based zoom interfaces" into lmp-dev