Snap for 8346178 from 8a3e6267c125019599a32cbe06d6f4867184f376 to simpleperf-release

Change-Id: I23da9a58105e0d0141d1a7a23b8ece74bf432382