Backed out changeset 8cde348c02fc (bug 837137) for Marionette timeouts. a=backout
Bug 824098 - Add assertion annotation for b2g18 branches. a=test-only