am 3336652f: Merge "Allow to overrde command make in envsetup.sh." into lmp-dev

* commit '3336652f22c3cfb5758213649ab4ac60302e82e7':
  Allow to overrde command make in envsetup.sh.