Merge "SurfaceFlinger: add more thread-safety annotations." into udc-dev