Bug 848270 - Various fixups for Android builds on OSX after bug 847479. r=nfroyd