Fix package naming, also remove bacon as optimization doesnt ddo much in jellybean

Change-Id: I78e7bf758262b19cf4a018d6bb1eab331d26f18c