(Imported from upstream's 912f08dd5ed4f68fb275f3b2db828349fcffba14,
52f856526c and
377551b9c4)

Change-Id: Ic2bf93371f6d246818729810e7a45b3f0021845a

This change stops the Intel, SHA instruction code from breaking the
Windows build.

PR: 3405

(Imported from upstream's 1f6d207625)

(Imported from upstream's 70fddbe32a)

(Imported from upstream's 729d334106)

Initial fork from f2d678e6e8 (1.0.2 beta).

(This change contains substantial changes from the original and
effectively starts a new history.)