Cherry pick r516 from upstream protobuf

Cherry pick r516 from upstream protobuf

Fix compilation for arm64.

TBR=cpu@chromium.org
R=mark@chromium.org
BUG=314720
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=251345

[sdefresne, 2014-02-13 19:29:56]

PTAL

[sdefresne, 2014-02-14 14:07:26]

-blundell, +mark: Could you please take a look (I see that you've sometimes
reviewed changes to that directory)?

[Mark Mentovai, 2014-02-14 14:15:19]

LGTM

[blundell, 2014-02-14 14:16:26]

Out of curiosity, do you know why we don't seem to roll protobuf?

[sdefresne, 2014-02-14 14:30:51]

The CQ bit was checked by sdefresne@chromium.org

[commit-bot: I haz the power, 2014-02-14 14:30:57]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/sdefresne@chromium.org/163723003/1

[commit-bot: I haz the power, 2014-02-14 14:30:59]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-02-14 14:31:00]

Failed to apply patch for third_party/protobuf/README.chromium:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file third_party/protobuf/README.chromium
  Hunk #1 FAILED at 28.
  1 out of 1 hunk FAILED -- saving rejects to file
third_party/protobuf/README.chromium.rej

Patch:       third_party/protobuf/README.chromium
Index: third_party/protobuf/README.chromium
diff --git a/third_party/protobuf/README.chromium
b/third_party/protobuf/README.chromium
index
f9f90e2ba5624f55e730a3b7894634a4648d8c13..279336fae727ef7e9588e64e3c3f70c1fcf7baee
100644
--- a/third_party/protobuf/README.chromium
+++ b/third_party/protobuf/README.chromium
@@ -28,6 +28,7 @@ details, and r179806 for the patch.
 
 Revision 504 was cherry-picked from upstream.
 Revision 512 was cherry-picked from upstream.
+Revision 516 was cherry-picked from upstream.
 
 Notes about Java:
 We have not forked the Java version of protobuf-lite, so the Java version does

[sdefresne, 2014-02-14 14:34:03]

The CQ bit was checked by sdefresne@chromium.org

[commit-bot: I haz the power, 2014-02-14 14:34:26]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/sdefresne@chromium.org/163723003/150001

[commit-bot: I haz the power, 2014-02-14 16:28:46]

Change committed as 251345