Disable NEON Poly1305 code.

See https://code.google.com/p/chromium/issues/detail?id=341598

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@250522 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

Change-Id: Ifca82ab4a06e5e038dd65326a178ee36d20ede96
Fix a malformed patch file.

R=agl@chromium.org,davidben@chromium.org,rsleevi@chromium.org

Review URL: https://codereview.chromium.org/227433012

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@262271 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

Change-Id: I3967587c6e7cf9fe76eb7bef2b81ff5c97f78289
Merge branch 'cm-11.0' into stable/cm-11.0