Revert "Bug 941478: Need x86/i686-linux-android-4.7 to build emulator-x86-jb. r=vicamo"

This reverts commit 1901086ca78f2d224245e8ceb5861d2cc569aec1.