Make it possible to run peerconnection_unittests on Android.

webrtc/build/apk_tests.gyp

Index: webrtc/build/apk_tests.gyp
diff --git a/webrtc/build/apk_tests.gyp b/webrtc/build/apk_tests.gyp
index 02a13421f9b6a47658e9f3d6d93e2f431580046b..45cb7b6eeee93e9ee96f84aeaefb11c4d47279e9 100644
--- a/webrtc/build/apk_tests.gyp
+++ b/webrtc/build/apk_tests.gyp
@@ -61,20 +61,18 @@
       ],
     },
     {
-      'target_name': 'libjingle_peerconnection_unittest_apk',
+      'target_name': 'peerconnection_unittests_apk',
       'type': 'none',
       'variables': {
-        'test_suite_name': 'libjingle_peerconnection_unittest',
-        'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)libjingle_peerconnection_unittest<(SHARED_LIB_SUFFIX)',
+        'test_suite_name': 'peerconnection_unittests',
+        'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)peerconnection_unittests<(SHARED_LIB_SUFFIX)',
       },
       'dependencies': [
-        '<(DEPTH)/talk/libjingle_tests.gyp:libjingle_peerconnection_unittest',
+        '<(DEPTH)/talk/libjingle_tests.gyp:peerconnection_unittests',
         '<(DEPTH)/talk/libjingle.gyp:libjingle_peerconnection_java',
       ],
       'includes': [
-        # Use webrtc copy of apk_test.gypi to allow test executables starting
-        # with "lib". See http://crbug.com/543820 for more details.
-        '../build/apk_test.gypi',
+        '../../build/apk_test.gypi',
       ],
     },
     {