am 5e83c908: am fa4b7fb8: Merge "Camera2: fix Surface cast issue" into mnc-dev

* commit '5e83c9080c71111955bf7e2559b453ffeb5b2c0d':
  Camera2: fix Surface cast issue