am 5a4cc0da: Merge "fix uses of grep in envsetup.h" into klp-dev

* commit '5a4cc0da02e2e2bfde7b07b612d57eecd8ade64e':
  fix uses of grep in envsetup.h