Merge "Fix -XX:DumpGCPerformanceOnShutdown for debug builds"
am: 5ec409da4a

Change-Id: I85b63ae0b0f53c8dea00837f233fb63edce06f71