Merge "simpleperf: prepare for adding user api." am: 235aa04cb8
am: 198020c753

Change-Id: Ibe78634e92996f607369c07814e4faa053f5c6bf