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

Change-Id: I5b23033e5481778e1e9f7d95a341bab985f6fa43