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

Change-Id: Iea203261dd8d49023ae7b446ec9ebd0f75edec80