Merge "adb: update symlink timestamps." am: effcb96670
am: c8f34c7920

Change-Id: I85c23af35d223e5b6956159b8105f908e67bff09