Revert "build: move bionic optimizations to NEON makefile"

This reverts commit d3031e591e4cdaa7586a4a003b1a933a25e5a44b.