Remove duplicate Makefile.in changes and move to moz.build.
Fix missed merge conflict causing places test failure by bumping schema version.
Fix build/packaging issues with moving to separate interests component.