Merge "resourceloader: Use -1 instead of null in DerivativeResourceLoaderContext"