Makefile.am cleanups

Bug #79411