Merge "Read shell's PATH rather than make's to avoid warning logspam." am: 172c2d3665
am: 8fd61540f6

Change-Id: I9aad9c9de699e1d3b9a5b8309e371b3b68d84349