Merge "GC in heapDumpFinished to cleanup hprof fd"