Bug 940412 - Augmenting the delay when forging a "tap" from the
EdgeSwipeDetector.
Merge pull request #13839 from etiennesegonzac/bug-940412-sendtap-delay

Bug 940412 - Augmenting the delay when forging a "tap" from the EdgeSwipeDetector. r=vingtetun
Revert "Bug 915672 - Modify marionette test driver scripts to add support for gathering power draw data. r=dhunt r=jgriffin"

This reverts commit e44921850131b3671592e669f73f500dee4caf7d.