Merge "Add a /bin symlink for convenience." am: dcc0f8f76b
am: 7a54ed9e28

Change-Id: Ie7f7fec5218b721d21b5ade97988c2aff5c7ed2d