Bug 1043023 - Added mock configuration for android platform. r=dustin
Merge default -> production

--HG--
branch : production