Merge "Add null checks to weak DexCache references"