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

Change-Id: I74a372110584740014a8d7ea4fe5896dd38c40e2