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

Change-Id: I7d1028d1b3b221039a0103fcb0c05c3fa878a946