Backed out changesets 9ba22af0a840 and db79b5ea167b (bug 863241) for Werror fail.
Bug 863241 - Part 2: B2G MMS: the return items from getThreads should have type to identify mms or sms. r=vyang