Resolve Android conflicts

While working on experimental support for Android in denominator, I noticed and resolved conflicts in the build.  Feel free to suggest cleaner dodges.