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

Change-Id: Icfacec9017552a18a77d2e84b8676758c7b71143