Merge "surfaceflinger: fix a nullptr dereference" into oc-dev
am: 29e5fa3fda

Change-Id: I8b183fcc791880d464847340b8024a81d9f3b498