Merge "Add chmod(1) symlink." am: 100cc3cc54 am: 0019d0c193
am: 7d466ad4bf

Change-Id: Ibae6105c75650fff639c98f203d25e80b5ca2d3f