Fix -march=armv7-a conflict error

Change-Id: Ia67f2b78057ba7a45657ae230fa9189c446b0d82