Backed out changeset 8d883cb49438 (bug 887815) for B2G Arm Marionette failures. a=backout