Merge "Clean up some style in the makefiles." into gingerbread