Remove some optional packages from "mini" builds

Change-Id: I31f502a10d64343c8800d51df28b6de49e44bccc
Remove duplicate value for Sweden 2G

Change-Id: If71cfb799a23a46c039ecefab718433ad0c2bf82
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0