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