Revert "Continue to use march=i686 before fix of g++ ICE."
Revert "Continue to use march=i686 before fix of g++ ICE."

This reverts commit f70f009ca8b4779cc3a5f44e7d92b1c297e16c8b.

Change-Id: I3e1b18cf342e747c8a8405f1fc2513e5ebafc4b6

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build