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

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