Merge "libc fortify: make stdio.h use diagnose_if" am: 6e0de9da am: ced73cda am: 79e01ac0 am: 3d4a560c am: 332b8a3d Change-Id: I960d7349e93321fa05e20a987f6ed77a6ad736fc