systemd: Forward port musl patches

Redo the header include patch and add fixes for new code.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>