Merge "libc fortify: make poll.h and stat.h use diagnose_if" am: cff14d9e am: f5b6f133 am: 910c9ec6 am: 6aee92af Change-Id: I8027dc2517821accf7965dfbfe5ef03602619728