Move some packages to extras

Change-Id: Id5fc36094d86bf39980dfe8840a8e53831763d97