Unfortunately the "build.extra_flags" option doesn't include the USB flags specified in the boards.txt file, overwriting them instead which breaks compilation with the Leonardo. Reversing this until I can think of a better solution. This reverts commit bd8c3f6739.