Fix NEON and SSE handling am: da5155b2f5 am: 0313b5aedb
am: 232858ab35

* commit '232858ab359c214c2b0006f298531ce8565acf08':
  Fix NEON and SSE handling

Change-Id: Ia2b0b267285fa47d8715efc4bb6ebcdc4dc22609