normalize ARMv7 compilation treatment

Change-Id: I15061d33738486272855970096f2ea8c7829254d