Merge "Switch envsetup.sh dumpvars to soong_ui" am: 2023783f4f am: 114bf62d39
am: b88b6bcb78

Change-Id: Ic9130dc39e525178314e8c8a6a59fedbe247d46e