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

* commit 'd8fcc2e3599ef85514151dfec4c68c38ac89d671':
  Camera2: fix Surface cast issue