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

Change-Id: Ia116a6dba994efa30602ff9fa1b71d9e2559dec8