am d24943d9: am d803ef13: (-s ours) am 08b12dfb: Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev * commit 'd24943d9':