Get rid of second id for folders.

Use the uri to compare two folders.

Change-Id: I95c63190ec3a467b0b792f8c8104b6a69fa4b8c7
7 files changed