Merge "Read shell's PATH rather than make's to avoid warning logspam." am: 172c2d36 am: 8fd61540 am: 9b83f04b -s ours Change-Id: I8a991ccebae589f266e3d5e27e2711d57ba0febb