Merge changes Ib3b44e83,I70d50928

* changes:
  Add a new build target armv7-a-neon
  Modify the armv7-a target arch to not use NEON