[automerger skipped] Merge "SF: Enforce thread safety for SurfaceFlinger...
[automerger skipped] Merge "SF: Enforce thread safety for SurfaceFlinger class" into rvc-dev am: b209e7b5 am: 980d5597 -s ours
am skip reason: Change-Id Ibada81998d70c940c7406ef292b2d487fb02189d with SHA-1 a19f4b62 is in history
Change-Id: Ie051c769568e2dad6f28322e0cd10fd9d6f39b62