Merge "Add manta support to android_emmc_perf_tests.sh" into jb-mr1-dev