Merge "libc fortify: make string.h use diagnose_if" am: b1b125ea am: 5869bbe1 am: eaf1c564 am: 0a1d5ac5 am: 61937183 Change-Id: Ie3c58283481176099cfc63ced54e0bb4d2e1ef5b