build: Fix use of a deprecated automake variable

‘INCLUDES’ has been superseded by ‘AM_CPPFLAGS’.
build: Update git.mk from upstream

This also sneakily includes pending AppData support from
https://github.com/behdad/git.mk/pull/14.