Merge "Use armv7a arch flag instead of arch variant"