Merge "libc fortify: make unistd.h use diagnose_if" am: 0ec52ce1 am: a28402b4 am: d8fdc7b2 am: dbbc70d5 am: 2c533726 Change-Id: Ib20eed8a31d178ca06440e49b78a90a480d9b89b