Sync add-on patch with upstream

The testsuite/Makefile.am file was removed in upstream, we need to
remove it from the patch too.