am 3949f664: Merge "SurfaceFlinger: Fix null pointer exception"

* commit '3949f664c71ad1269ee0c921d176e3b4484015cc':
  SurfaceFlinger: Fix null pointer exception