Merge "libc fortify: make socket.h and stdlib.h use diagnose_if" am: a821283d am: 1ede4abc am: e1ba44a4 am: b494e0b9 Change-Id: I160fa1c1d352249b79ce88edfbdf7d562e6ae21f