Backed out changeset 3fde6fc99b0a (bug 1020368) for non-unified bustage.
Backed out changeset 10616214c160 (bug 1091916) for Android x86 S4 permafail.
Backed out changesets 4cb1154b0190 and 506d33f3931e (bug 1090501) because it depends on another patch that was backed out.
Merge m-c to b2g-inbound. a=merge