Merge "fix AVX & AVX2 detection"
authorJames Zern <jzern@google.com>
Wed, 21 Jan 2015 20:59:07 +0000 (12:59 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 21 Jan 2015 20:59:07 +0000 (12:59 -0800)

Trivial merge