Merge "Don't enable ARM_R4_SUSPEND_FLAG."