Move registration into android package

Mutator registration is tightly coupled with the android package, move
all registration from the soong package to the android package.

Test: build.ninja identical
Change-Id: Ie183d0b52cc7431c9e05b231934d189208ef1efe
diff --git a/android/env.go b/android/env.go
index f9d8030..3b523a2 100644
--- a/android/env.go
+++ b/android/env.go
@@ -15,7 +15,6 @@
 package android
 
 import (
-	"android/soong"
 	"android/soong/env"
 
 	"github.com/google/blueprint"
@@ -29,7 +28,7 @@
 // a manifest regeneration.
 
 func init() {
-	soong.RegisterSingletonType("env", EnvSingleton)
+	RegisterSingletonType("env", EnvSingleton)
 }
 
 func EnvSingleton() blueprint.Singleton {