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

Change-Id: Iac992e7b7bc81ba4410e963f2e964828cfd78da0