Merge "make stack_protector_DeathTest work for gcc4.9"