Bug 925398 - Refactor runtests.py to follow Mixin pattern
Bug 948799 - Xfail test_cost_control_reset_wifi.py
Bug 948842 - Re-enable test_sms_with_attachments.py
Merge pull request #14562 from askeing/948842

Bug 948842 - Re-enable test_sms_with_attachments.py
Merge pull request #14552 from askeing/948799

Bug 948799 - Xfail test_cost_control_reset_wifi.py
Revert "Merge pull request #14529 from jaoo/933203"

This reverts commit 4dd40d64f137c48104d5f39e48c2ccb0ce9ab78c, reversing
changes made to 0985280ffc917353eb34ff7b0dcc1c152856450c.

This is breaking unit tests:
[system] system/LockScreenConnInfoManager > Single sim devices "before each" hook:
TypeError: MockNavigatorMozIccManager.addIcc is not a function
Merge pull request #14476 from malini/mixin

Bug 925398 - Refactor runtests.py to follow Mixin pattern, r=davehunt