Merge "asanwrapper: remove all environment editing."
am: a76ee7fb16

Change-Id: I81e229a15edf12665279e89044056a783bb234a4