Fix file import & sane format migration.

1 job for master in 4 minutes and 54 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Build
failed #107809769
brew java_9 xcode_9
build_project

00:04:54

 
Name Stage Failure
failed
build_project Build
	at org.gradle.api.internal.AsmBackedClassGenerator$ClassBuilderImpl.generate(AsmBackedClassGenerator.java:967)
at org.gradle.api.internal.AbstractClassGenerator.generateUnderLock(AbstractClassGenerator.java:226)
... 88 more


* Get more help at https://help.gradle.org

BUILD FAILED in 4s
ERROR: Job failed: exit status 1