The most important part of this merge is that it REVERTS FMP
compatibility, since no such thing needs to exist in 1.8. In fact,
there isn't even an FMP in 1.8 yet. It will be added back if FMP ever
ports to 1.8 and the problem still exists.
This converts the project into a multi-module Gradle build.
By default, Git does not show history past a rename, so use git log
--follow to see further history.