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

Change-Id: Idb6ed11ecf1a63cf98f91aa9148ddc37fa151864