am b5a913f9: am f99eba07: am ec2efb9c: am 08b12dfb: Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev

* commit 'b5a913f9e264b79f5c714d4a590a44dac2ed2cf2':
  Camera2: Legacy: Lock down surface sizes before creating EGL surfaces