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

Change-Id: I317482c0e4ed1cdc2dc6e30e1835208be28b3020