Bug 903476 - Fuzz a bit more and android as well.

--HG--
extra : rebase_source : 57d9a1ed3549a0c8a2af9fb8be42b5823f21a2ec