am 61cc1ee3: am cee46cfe: am 1527edbc: Merge "Camera2: fix high speed output surface format check" into mnc-dev

* commit '61cc1ee35abdcd2a597e99842fd87a1385bcf19d':
  Camera2: fix high speed output surface format check