Revert "optimize for armv7-a"

This reverts commit acebfd6d419cc6d56b248d5055c10c0a3f03cd99.

Change-Id: I3fa23a1caae9dc07e794905c8ab50678b04843d2