Merge "releasetools: Set the search path based on the current executable." am:...
Merge "releasetools: Set the search path based on the current executable." am: 21fb7655 am: c7e34806 am: 56d16c0b
am: e83e0890
Change-Id: I7cb3ab5f7927ecd567a5714a5e3df2de0931bd91