util.py: Fix unsetenv and add more modules
aosp-stable: Remove the backup of skia as we do not need them any more