Slim the product packages down a little

Change-Id: Id5866ed4041601553ca855e52058c3d050b42483