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

Change-Id: I9d0c691886a0726fa37d7ffc2e07cb00b6f8310e