Bug 935214 - Consolidate Android x86 test sets; r=armenzg