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

Change-Id: I727038e661f7cb82c4b77e736529930479aa8064