Merge "Fix google-explicit-constructor warnings in simpleperf." am: eddb94dc8b
am: 9ebb388c20

Change-Id: I929dd04d2325b6049021ed20b6bc0efba6844d18