Snap for 12821328 from 6a500bc10eb6ab14d3536855e678ff37b09711e7 to simpleperf-release

Change-Id: Ib1d41aacfa4a49feaa357e99ae1997278a33f000