Remove unused submodules.
Switch to mainline branch of Arduino-Makefile.

Requires a 'git submodule sync'.