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

Change-Id: I9831fbfc39ac8b782913fb6bb5f0d96255ae13e6