Merge "adb: allow symlinks to directories in directory_exists." am: c10c31e8ba
am: 36699d3fb2

Change-Id: If5d4ad7ee69be834f58788d823758cf230f51fdc