Bug 958736 - Move the localization logic to LockScreenConnInfoManager
Merge pull request #16111 from crh0716/958736

Bug 958736 - Move the localization logic to LockScreenConnInfoManager r=alive
Bug 968688 - Build sensors.json and support.json with settings/Makefile
Merge pull request #16130 from timdream/build-appdata-settings

Bug 968688 - Build sensors.json and support.json with settings/Makefile, r=yurenju
Bug 968668 - Add Makefile for browser