Point platform/tools/gpu and platform/external/protobuf to master.