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

Change-Id: I110a2f29c49c4a9a56fcca639b8e6489e731df1c