Merge "simpleperf: update demo." am: 0f0bc1d7ea
am: a160af256f

Change-Id: I30df97fa383698ee4feec14401f5d6527eec376a