am 22e96e4d: am 63a3cc14: Merge "Add {BEGIN,END}_DECLS to header file."

* commit '22e96e4d8449bbb1bad5a5b0a546882997d38148':
  Add {BEGIN,END}_DECLS to header file.