Fix package names

There is no need to make the names dynamic, lets set them to
static names to prevent further errors and clear up confusion

Do not include hardware composer, it will result in a bootloop

Also includes some other fixes

Change-Id: I8505b98dc4fa339045e54bbdab1b56a2eaf52a4c