Merge "Fix the run-as environment to better match su."
am: 83f33e6c93

* commit '83f33e6c930376d82b7c4867e24a75286782737e':
  Fix the run-as environment to better match su.