Merge "Support /product/bin" am: 36b61f061d am: 931e0f268a
am: cf5e8f1575

Change-Id: I9ef94a439b75a8f95b07761d3fe3c3b863294e0c