i965/blorp: Merge into gen7_{sf,sbe}_state.