Add support for Android aidl and support for gyp's java_in_dir

net/net.gyp

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
 
     'linux_link_kerberos%': 0,
     'use_tracing_cache_backend%': 0,
@@ skipping 1664 matching lines @@
           'type': 'none',
           'sources': [
             'android/java/PrivateKeyType.template',
           ],
           'variables': {
             'package_name': 'org/chromium/net',
             'template_deps': ['android/private_key_type_list.h'],
           },
           'includes': [ '../build/android/java_cpp_template.gypi' ],
         },
-      ],
-    }],
-    ['OS == "android"', {
-      'targets': [
         {
           'target_name': 'net_unittests_apk',
           'type': 'none',
           'dependencies': [
             'net_java',
             'net_javatests',
             'net_unittests',
           ],
           'variables': {
             'test_suite_name': 'net_unittests',
@@ skipping 30 matching lines @@
             'net_unittests.isolate',
           ],
           'sources': [
             'net_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }