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

* commit '54a81734450e876cf5699d74b224c19771b89461':
  fix uses of grep in envsetup.h