Merge "Add a /bin symlink for consistency."
am: ed369101ba

Change-Id: Iac7a3234333f46aaba83b47f66ba73074be86fe6