[DO NOT MERGE] Fixing build error in launcher_protoutil_lib

> Since test build rules were included before the launcher_protoutil_lib
rule, all the following paths got prefixed with "tests/" giving file
not found error

Change-Id: I13f96fc2f14336b0ff40f086176cc4afbc254791
(cherry picked from commit d68725cd20)

Android.mk

@@ -47,8 +47,6 @@ LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
 include $(BUILD_PACKAGE)
 
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
 #
 # Protocol Buffer Debug Utility in Java
 #
@@ -86,3 +84,6 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/util/etc/launcher_protoutil | $(ACP)
 	$(hide) chmod 755 $@
 
 INTERNAL_DALVIK_MODULES += $(LOCAL_INSTALLED_MODULE)
+
+# ==================================================
+include $(call all-makefiles-under,$(LOCAL_PATH))