Merge "simpleperf: fix binary_cache_builder.py." am: d97ac9244d
am: 2395b3c86d

Change-Id: I0cba39486f1dc40f884300f2993794961d024f10