Merge "surfaceflinger: fix race condition" into pi-dev am: b06767b778
am: a026ba394c

Change-Id: I068ab522ef064d2e73cac1c349b722066d37b2d6