Merge "Have patchoat --verify verify symlinks"
am: faecd6b86a

Change-Id: I560722bebefdfdcd4f2d57515bb04e5c665d6aa3