autotools: s/INCLUDES/AM_CPPFLAGS/

autotools 2.69 onwards is now warning that the older INCLUDES directive has
been renamed.  Since 2.69 is itself fairly well established, this shouldn't
break backwards compatibility.
Merge remote-tracking branch 'cvs/branch-2_6' into branch-2_6