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

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