Merge "Remove legacy kernel build toolchain PATH setup in envsetup.sh"