[automerger skipped] Support /product/bin
am: 9bd3ee1c4f  -s ours

Change-Id: Ie383841f24ad4eb0a79d67a9bdb82a66c8bb25c1