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

Change-Id: I17ccc9e2980c3ed9ab60872a890aea0b47ba7fab