Merge "Fix -XX:DumpGCPerformanceOnShutdown for debug builds"