Merge "Revert "fix sdcard path for webkit perf and layout test scripts"" into jb-mr1-dev