Change in otopi[master]: build: cleanup Makefile.am order