Merge "benchmark: use getExternalFilesDir() to save results" am: 2eb76e5fd6 am: 8f852b3860 am: 8747ecb867

Change-Id: I4aacb96a2c5e9f5d9b29c3673f2386b28a27c8f1