Revert "Use protoc-gen-javalite for java lite protos"

This reverts commit 5a5aca05680f2289e00583adeafa3d5f54da51ae.

Change-Id: Iadbc2ec7fbc45d888383e0e6f569cbfc5ef6a996
(cherry picked from commit 37a07b1784847938b0ff10d53d4d382e58bd0ba6)
diff --git a/android/config.go b/android/config.go
index cca1c7a..695a298 100644
--- a/android/config.go
+++ b/android/config.go
@@ -351,10 +351,6 @@
 
 var _ bootstrap.ConfigBlueprintToolLocation = (*config)(nil)
 
-func (c *config) HostToolPath(ctx PathContext, tool string) Path {
-	return PathForOutput(ctx, "host", c.PrebuiltOS(), "bin", tool)
-}
-
 // HostSystemTool looks for non-hermetic tools from the system we're running on.
 // Generally shouldn't be used, but useful to find the XCode SDK, etc.
 func (c *config) HostSystemTool(name string) string {
diff --git a/java/builder.go b/java/builder.go
index c52e942..cefb916 100644
--- a/java/builder.go
+++ b/java/builder.go
@@ -161,7 +161,6 @@
 	kotlincClasspath classpath
 
 	protoFlags       []string
-	protoDeps        android.Paths
 	protoOutTypeFlag string // The flag itself: --java_out
 	protoOutParams   string // Parameters to that flag: --java_out=$protoOutParams:$outDir
 	protoRoot        bool
diff --git a/java/proto.go b/java/proto.go
index 0bb37c5..8028039 100644
--- a/java/proto.go
+++ b/java/proto.go
@@ -59,7 +59,6 @@
 		Description: "protoc " + protoFile.Rel(),
 		Output:      srcJarFile,
 		Input:       protoFile,
-		Implicits:   flags.protoDeps,
 		Args: map[string]string{
 			"protoBase":      protoBase,
 			"protoOut":       flags.protoOutTypeFlag,
@@ -94,16 +93,14 @@
 func protoFlags(ctx android.ModuleContext, j *CompilerProperties, p *android.ProtoProperties,
 	flags javaBuilderFlags) javaBuilderFlags {
 
-	var plugin string
-
 	switch String(p.Proto.Type) {
 	case "micro":
 		flags.protoOutTypeFlag = "--javamicro_out"
 	case "nano":
 		flags.protoOutTypeFlag = "--javanano_out"
 	case "lite":
-		plugin = "protoc-gen-javalite"
-		flags.protoOutTypeFlag = "--javalite_out"
+		flags.protoOutTypeFlag = "--java_out"
+		flags.protoOutParams = "lite"
 	case "full", "":
 		flags.protoOutTypeFlag = "--java_out"
 	default:
@@ -111,15 +108,15 @@
 			String(p.Proto.Type))
 	}
 
-	flags.protoOutParams = strings.Join(j.Proto.Output_params, ",")
+	if len(j.Proto.Output_params) > 0 {
+		if flags.protoOutParams != "" {
+			flags.protoOutParams += ","
+		}
+		flags.protoOutParams += strings.Join(j.Proto.Output_params, ",")
+	}
+
 	flags.protoFlags = android.ProtoFlags(ctx, p)
 	flags.protoRoot = android.ProtoCanonicalPathFromRoot(ctx, p)
 
-	if plugin != "" {
-		path := ctx.Config().HostToolPath(ctx, plugin)
-		flags.protoDeps = append(flags.protoDeps, path)
-		flags.protoFlags = append(flags.protoFlags, "--plugin="+path.String())
-	}
-
 	return flags
 }