Merge "Don't reset OOM adjType to cch-empty during recomputing on cycles" into rvc-dev