Bug 1093874 2nd attempt

New pull request created for Bug 1093874, reverting dummy filechange commit
Bug 1106074 - Audio output goes through speaker and earplugs in emergency dialer