Bug 820592 - buildbot config changes to support Android x86 builds - revert for beta bustage