Merge change I61343808 into eclair-mr2

* changes:
  Remove external/protobuf from the build, now that it's been moved to vendor/google/libraries.