Merge "Remove sdcard_perf_test"
am: 68d1cc59e9

Change-Id: Id56d451765cd8c889a2fe1084240be4f03766742