Merge "Merge "GC in heapDumpFinished to cleanup hprof fd" am: f126c41de7 am: 8e82bc9961 am: c3cc786404" into oc-dr1-dev-plus-aosp