Merge "Add shortcut to atest after envsetup.sh is sourced." am: 6417aa89e4
am: 97053a075c

Change-Id: Iaac2208f6fdcceb5740f4c004ebd4ccc26d3f7c6