am 9200d4e3: Merge "Update protobuf library from 2.3 to 2.6."

* commit '9200d4e3bf0bf9bf21d9bb335e04818364bf12a8':
  Update protobuf library from 2.3 to 2.6.