Merge "Remove uses of libcore.util.Objects.hashCode / equals."