Merge "fortify: use __builtin_constant_p for more short-circuits"
am: 30d4c6fb06

Change-Id: I1afdad78569cca684d5c825c31c2c835669f0418