Merge "envsetup.sh: say -p for plain, not -ps."
am: 07d639a4fd

Change-Id: I6cc5e5d0c52e7bf26e23710ffb40db379d00e252