Merge "Fix the symlink detection when signing TF.zip." am: 78a41f6553
am: a09e14e5da

Change-Id: I1735e789eda57c4dfa1f7b180ab9dce96fc4b1e3