Bug 784816 - Adding upgradeToSecure() to support startTLS in MozTCPSocket. r=mayhemer sr=sicking a=blocking-b2g=leo+ from bug 914520

Uplift patch prepared by asutherland@asutherland.org.  Tested using xpcshell
tests and on unagi device running b2g18 with gaia v1-train and modified email
app.
Bug 915658 - Add timestamp data to Marionette touch event logging. r=jgriffin, a=test-only
Bug 913492. r=khuey, a=blocking-leo+
Bug 917575 - Disable test_0010_timermanager.js on opt B2G due to perma fail, a=test-only
finishing up the version bumps NO BUG r=me a=me
Bug 838331 - Add MP3 to codec list for Firefox OS. r=doublec, a=leo+
Backed out changeset fbd799b73e71 (bug 838331) for B2G bustage. a=backout
DONTBUILD
Merge b2g18 to v1.1hd. a=merge