Merge "Don't use __attribute__(__error__)"