Crosswalk M36 Gardening : Update envsetup.sh due to upstream changes.

build/android/envsetup.sh from upstream renamed some variables. Make
sure we use these ones now.