am 19a443e4: Merge "Update protobuf library from 2.3 to 2.6."

* commit '19a443e4e8bf3d37e544eda2c407604616cdae9d':
  Update protobuf library from 2.3 to 2.6.