Merge "Add /product/bin to path" am: 118ab10d75
am: c626794192

Change-Id: Ide7b616b56fc31c9ce681ab35cb98c6faaff3f8b