Bug 939823 - Split Android x86 S1 into 2 sets; r=armenzg