I'd prefer that libcheaders stays explicitly set.

Bumping libc-headers is something we do carefully, and should not be a
common devtool
operation, and is not something that we want automated at all. Having
that extra variable
to set is a good thing for the headers, it helps reenforce that you
really should know what
you are doing.