Merge "crash_reporter: Clean up symlinks in unit test" am: 36016e2742
am: 96df20f628

* commit '96df20f6280562654d8a96cebcab6d2d97245e06':
  crash_reporter: Clean up symlinks in unit test