Fix NEON and SSE handling
am: da5155b2f5

* commit 'da5155b2f54bc136754590d0871008d9622c8100':
  Fix NEON and SSE handling

Change-Id: I15a2c962efdb2b0aa96a03428fa1f94afd30cee0