Make `#include "Rts.h"` C++-compatible again (re #8676)

Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
Merge latest upstream GHC changes