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

Change-Id: Ifdae3d050bfc5ed5749c83434ee9af8398394b88