Snap for 6844436 from 3a2cb7a60debb5be099d4bb3285722a98407aabc to simpleperf-release

Change-Id: If9d12563b9edb09deb1b3cc3ef83333d75ebad82