Merge "Add patch(1) symlink." am: 90e2765db4 am: da59240bd8
am: fa062c6395

Change-Id: I96658f5634e9b86c9ccd2f6e642f8365d2d85b27