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

* commit '0c949bd86773c5d39df11cd824c9df372dc00342':
  Update protobuf library from 2.3 to 2.6.