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

Change-Id: I5f338f85ef1f88cbd383a0d67d4b9a8b4bbdde8e