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

Change-Id: Ib135a464980bd6f4459e1aa5f8b2ef1f0277c9a4