Merge "Allow to overrde command make in envsetup.sh." into lmp-dev