Merge "Test java.util Collections tests using guava-testlib." am: 69f13316b8
am: cb1aae27c8

Change-Id: Iee6c98ec373128a4d74696fb58a1afcc13da7fb8