Merge "Check for null in applyDefiningSharedLibraryUpdateLocked."