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

Change-Id: Id7cbf2be35c3358d797e2d8f30b10d72f07849e1