Merge "Do not call build/envsetup.sh in create_reference_dumps" am: 8e167af345 am: 971a737326
am: b3902c2425

Change-Id: I3ca9c0a16fdfd13f0aeb60c0b92ca09b924d761b