Merge "Support /product/bin"
am: 36b61f061d

Change-Id: I9f4c48794c99e338959624e240357854f51c8ccc