Bug 925584 - Remove some unnecessary jsapi.h inclusions from .cpp files.  r=Ms2ger.

--HG--
extra : rebase_source : 41fcb0e922a519ef679c1c1b6293c2b638e83a48
Merge m-c to m-i
Bug 912015 - Support multiple wap_supplicant connections. r=mrbkap
Merge Mozilla-Inbound to Mozilla-Central