Merge "Add null checks to weak DexCache references" into nyc-dev