Merge "Fix WITH_ARM_V7_A flag not corectly set issue"