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

Change-Id: I9ab35782f63067445964e8843dd3bddb76855c14