Land b_build_gate onto HEAD (20081219_2157)

b=18078

Land the build gate branch to build HEAD since we are going to retire
b1_8_gate. No real changes here except indenting fixes.