Code review: 171650043:  Changes and fixes in build dependencies script.