Merge branch 'master' into import-fix
Desugaring workaround for imports.
Copy of generated files.
Merge branch 'master' into import-fix
Use non-generated index/analysis libraries.
Fixed import DefData's being stored on wrong path.
Import non-generated index/analysis libraries from nd files.
Merge branch 'master' into import-fix
Undo desguar.
Merge branch 'import-fix'