Merge "libc: Add diagnose_if macros to cdefs." am: c2a10f7f am: 8bfe9f81 am: 63e067af am: e5a3aeaf am: 1f02c4b1 Change-Id: I28ab714a487d06f96642ec48393e005f0621d6dd