Issues with building the intellij idea/143.249.6 branch on Mac OSX

Hi,

I recently pulled the idea/143.249.6 locally and ran the getPlugins.sh. I run into build failures when doing an ant build, it complains that IdeModelsProviderImpl class is missing.  Any suggestions?

Logs:

     [java] ##teamcity[compilationStarted compiler='java']
     [java] ##teamcity[message text='/Users/harani/intellij-community/android/android/src/com/android/tools/idea/gradle/service/sync/SyncEntityDataComparisonStrategy.java:26:|ncannot find symbol|n  symbol:   class IdeModelsProviderImpl|n  location: package com.intellij.openapi.externalSystem.service.project' status='ERROR']
     [java] ##teamcity[compilationFinished compiler='java']
     [java] ##teamcity[compilationStarted compiler='java']
     [java] ##teamcity[message text='/Users/harani/intellij-community/android/android/src/com/android/tools/idea/gradle/service/sync/service/Ide2GradleModuleDependencyService.java:34:|ncannot find symbol|n  symbol:   class IdeModelsProviderImpl|n  location: package com.intellij.openapi.externalSystem.service.project' status='ERROR']
     [java] ##teamcity[compilationFinished compiler='java']
     [java] ##teamcity[compilationStarted compiler='java']
     [java] ##teamcity[message text='/Users/harani/intellij-community/android/android/src/com/android/tools/idea/gradle/project/AndroidGradleProjectResolver.java:108:|nmethod does not override or implement a method from a supertype' status='ERROR']
     [java] ##teamcity[compilationFinished compiler='java']
     [java] ##teamcity[compilationStarted compiler='java']
     [java] ##teamcity[message text='/Users/harani/intellij-community/android/android/src/com/android/tools/idea/gradle/project/AndroidGradleProjectResolver.java:117:|nincompatible types: com.intellij.openapi.externalSystem.model.DataNode<com.intellij.openapi.externalSystem.model.project.ProjectData> cannot be converted to com.intellij.openapi.externalSystem.model.project.ProjectData' status='ERROR']
     [java] ##teamcity[compilationFinished compiler='java']
     [java] ##teamcity[compilationStarted compiler='java']
     [java] ##teamcity[message text='/Users/harani/intellij-community/android/android/src/com/android/tools/idea/gradle/service/sync/SyncEntityDataComparisonStrategy.java:78:|ncannot find symbol|n  symbol:   class IdeModelsProviderImpl|n  location: class com.android.tools.idea.gradle.service.sync.SyncEntityDataComparisonStrategy.ModuleStrategy' status='ERROR']
     [java] ##teamcity[compilationFinished compiler='java']
     [java] ##teamcity[compilationStarted compiler='java']
     [java] ##teamcity[message text='/Users/harani/intellij-community/android/android/src/com/android/tools/idea/gradle/service/sync/service/Ide2GradleModuleDependencyService.java:69:|ncannot find symbol|n  symbol:   class IdeModelsProviderImpl|n  location: class com.android.tools.idea.gradle.service.sync.service.Ide2GradleModuleDependencyService' status='ERROR']
     [java] ##teamcity[compilationFinished compiler='java']
     [java] Some input files use or override a deprecated API.
     [java] Recompile with -Xlint:deprecation for details.
     [java] Some input files use unchecked or unsafe operations.
     [java] Recompile with -Xlint:unchecked for details.
     [java] Some messages have been simplified; recompile with -Xdiags:verbose to get full output
     [java] Errors occurred while compiling module 'android'
     [java] ##teamcity[blockClosed name='Module |'android|' production']
     [java] ##teamcity[blockClosed name='Compilation']
     [java]
     [java] BUILD FAILED
     [java] /Users/harani/intellij-community/build/gant.xml:58: Compilation failed
     [java]
     [java] Total time: 4 minutes 43 seconds