[automerger skipped] Update symlinks that were broken when we ran git filter-branch am: 7db7aa7e27 am: 93f9c5f673 -s ours
am: 8db320d3a3

Change-Id: I74ba0a7693eaecd7d8f272f70c7e40162f7301b2