Merge "Camera2: Round unsupported surface sizes in configure." into lmp-mr1-dev