Merge "Check for null in applyDefiningSharedLibraryUpdateLocked."
am: 801862313f

Change-Id: I5beab35e1d6fda02895e9479015f4ea2276be5c1