Merge "SurfaceFlinger: add more thread-safety annotations."