Merge "Have patchoat --verify verify symlinks" am: faecd6b86a am: 50a1c3c0c1
am: f58419dce0

Change-Id: I9cca019939d3e1446acaf6bfc2c92b7ff5c0c0ec