Merge "Switch envsetup.sh dumpvars to soong_ui"