am 64606bd5: Merge "Update protobuf library from 2.3 to 2.6."

* commit '64606bd5b0b702b7f6d7fd1088486b5380ccc25f':
  Update protobuf library from 2.3 to 2.6.