Backed out changeset 3fde6fc99b0a (bug 1020368) for non-unified bustage.
Backed out changeset 10616214c160 (bug 1091916) for Android x86 S4 permafail.
Merge m-c to fx-team. a=merge