Merge "Revert "Add patch(1) symlink.""
am: a739c8b1a9

Change-Id: I4e476d1caa1682c1a52cb63eb2e62bad03894dde