Revert of [Android] Add ChromiumNetTestSupport.apk for the java EmbeddedTestServer.

base/android/java/templates/NativeLibraries.template

Index: base/android/java/templates/NativeLibraries.template
diff --git a/base/android/java/templates/NativeLibraries.template b/base/android/java/templates/NativeLibraries.template
index 4d81d45e667a544d3c16cf2c57b3066fabf23235..8b812a60a968ce05b1f23bae618799e4a78da44c 100644
--- a/base/android/java/templates/NativeLibraries.template
+++ b/base/android/java/templates/NativeLibraries.template
@@ -2,20 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NATIVE_LIBRARIES_PACKAGE
-#define NATIVE_LIBRARIES_PACKAGE org.chromium.base.library_loader
-#endif
-
-package NATIVE_LIBRARIES_PACKAGE;
+package org.chromium.base.library_loader;
 
 import org.chromium.base.annotations.SuppressFBWarnings;
 
-#ifndef NATIVE_LIBRARIES_CLASS_NAME
-#define NATIVE_LIBRARIES_CLASS_NAME NativeLibraries
-#endif
-
 @SuppressFBWarnings
-public class NATIVE_LIBRARIES_CLASS_NAME {
+public class NativeLibraries {
     /**
      * IMPORTANT NOTE: The variables defined here must _not_ be 'final'.
      *