Merge "Revert "Revert "Update protobuf library from 2.3 to 2.6."""