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

Change-Id: I9cbf0eaacdc8bdffba43013028c5203a7c46e516