Relanding 148377 - [Android] Upstream additional changes from envsetup.

Now requires you to specifically change the GYP_GENERATORS to specify Ninja. The original change broke because gyp ran for both make and ninja and the webkit bot determines whether to use ninja by the presence of (thanks to Peter for figuring this out)


Review URL:

git-svn-id: svn:// 0039d316-1c4b-4281-b951-d872f2087c98
4 files changed