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

Change-Id: Ic57a2c0c21f76e38216bb3b36811311623289637