Merge "Move LazyIntToIntMap to services.jar"