Merge "simpleperf: add missing scripts in simpleperf_script.zip." am: e1a9f9267f am: 961f9fdb7a
am: 0740c15490

Change-Id: Iffc441f39d033680325857e9f835ab4bebe6b2bd