Merge "Merge "GC in heapDumpFinished to cleanup hprof fd" am: f126c41d am: 8e82bc99 am: c3cc7864" into oc-dr1-dev-plus-aosp