Merge "fortify: use a macro in diagnose_if"
am: b07c1973d1

Change-Id: I126b03545a63cc63b54d25796e80a3e49b2d49d5