am cceb8268: am 69421363: Merge "ImageWriter: Exception when Surface is abandoned" into mnc-dev

* commit 'cceb8268a12743b78593e34df662e45a8ee618ed':
  ImageWriter: Exception when Surface is abandoned