Bug 847898 - Put Android Beam support behind a confvar variable. r=mfinkle
bug 851653 add services to addonprovider for fhr, r=gps