Merge "simpleperf: add function comment." am: a5e9ad2074 am: cccd7e6946 am: 63a3b64a85
am: 1373b1012b

Change-Id: I51cab25ae61d63b44a2af7acbb426626be4e1442