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