Merge "Add {BEGIN,END}_DECLS to header file."