Merge "GC in heapDumpFinished to cleanup hprof fd" am: f126c41de7
am: 8e82bc9961

Change-Id: I4b9ecfcbe0e3757615ef4eca7602e4bf066a25e5