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

Change-Id: Ie541bea3a6d7704ae19652dc225c57b0c147737d