cherry-picked from 390231e8dd
390231e8dd
still using ant targets via importBuild except for dependency management