Merge pull request #8673 from timdream/fix-mock-fb-utf8

Bug 851476 - Fix encoding of mock_fb.js(cherry picked from commit 8accbbb49b1b67fd7b93194e07e6bf017e0c90c3)
Merge pull request #9413 from comoyo/fix_sdcard_tests

Bug 862742 - Fix lint and unit tests errors for sdcard import r=francisco.jordano(cherry picked from commit a75b3731696570c2851522758dd1653fcaebcb96)