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

* commit '0313b5aedbb4fb6e9bbc05f15dbca874b5e69cec':
  Fix NEON and SSE handling

Change-Id: Iaa076031931a62b2f7332ae3af5e1052e7504480