Bug 936226 - Sync androidx86.json with android.json; r=dminor