Merge "adb: identical symlink, do not update" am: 3614b39bb9 am: 7226476d28
am: 420a391d4b

Change-Id: I528078316cde5f24f5116d890d3e0ca9f7001d74