ref: cd94d5f68e269814591f4decae60da271a27ca3c
parent: b1a31f806624b5641667d10fc6901853868f98af
author: Johann <johannkoenig@google.com>
date: Mon May 1 13:54:19 EDT 2017
block error avx2: rename variables Change-Id: I2b8a9253f2c3d1fd85304c2970ebe70213870fe9