Merge "Add shortcut to atest after envsetup.sh is sourced."