Merge "Add bash completion to envsetup"