Remove some optional packages from "mini" builds

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