Merge "Make data dependency around HDeoptimize correct."