Merge "simpleperf: fix synchronization when reading mapped buffer." am: a587ece964
am: 04910bdaab

Change-Id: I5418e8a0579eb188d1af9fab7b478fd3361e678b