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

Change-Id: I03a4bb3604665a7853f954d8a90985b42c14cc32