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

Change-Id: I2ab4432bf6bccf0f73b03ba3e1e3ca1cab0fd973