Merge "simpleperf: enable two options by default." am: 7386d10cce
am: 848d294253

Change-Id: Ica2596c99204bcf7299f1eb431f37cbc3a0077b4