Separating packageName from the AndroidManifest

Test: Verified everything builds
Change-Id: Icd425e004d8420b8c7a5d221ef98ffbc22723f04
5 files changed