Merge "Remove sdcard_perf_test" am: 68d1cc59e9
am: 02c5bd86da

Change-Id: I4d049be663ae2d66fcb76244e45b0d904afa6ffb