Remove some optional packages from "mini" builds

Change-Id: I31f502a10d64343c8800d51df28b6de49e44bccc
merge remote

Change-Id: Id5a9629021ad84b913b42e436a869fe879bcfe34