Bug 895186. Androidx86 intial set of changes. NPOTB. r=aki