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

Change-Id: I5c54e0de3af18390115efc69c3225953cf4439f8