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

Change-Id: If73de4c0280bcbda08046dc658612be90d1ed417