Control mutator order

Register mutators inside lambdas that are called in a defined order to
correctly order mutators before and after the arch and deps mutators.

Test: build.ninja identical
Change-Id: Iefe2a3515aee8570e76a6e76925db4cda0e9e822
diff --git a/android/arch.go b/android/arch.go
index 606de48..61564d8 100644
--- a/android/arch.go
+++ b/android/arch.go
@@ -260,7 +260,7 @@
 	return target.Os.String() + "_" + target.Arch.String()
 }
 
-func ArchMutator(mctx BottomUpMutatorContext) {
+func archMutator(mctx BottomUpMutatorContext) {
 	var module Module
 	var ok bool
 	if module, ok = mctx.Module().(Module); !ok {