Merge \"Fix google-explicit-constructor warnings in simpleperf.\"
am: ee87476e38

Change-Id: I2d76b015f42b24e5e467b406b9f560a682b20f69