Merge "Run clang-format on Layer/SurfaceFlinger files"