[Android] Update android test instructions.

docs/android_test_instructions.md

 # Android Test Instructions
 
 Device Setup Tests are runnable on physical devices or emulators. See the
 instructions below for setting up either a physical device or an emulator.
 
 [TOC]
 
 ## Physical Device Setup **ADB Debugging**
 
 In order to allow the ADB to connect to the device, you must enable USB
@@ skipping 96 matching lines @@
    NB: We used to call the chrome_public_test_apk the
    chromium_shell_test_apk. There may still be references to this kicking
    around, but wherever you see chromium_shell_test you should replace with
    chrome_public_test.
 
 Once you know what to build, just do it like you normally would build anything
 else, e.g.: `ninja -C out/Release chrome_public_test_apk`
 
 ## Running Tests
 
-All functional tests are run using `build/android/test_runner.py`.
+All functional tests are run using `build/android/test_runner.py`, either
+directly or via a generated wrapper script in `<output directory>/bin/`.
 Tests are sharded across all attached devices. In order to run tests, call:
 `build/android/test_runner.py <test_type> [options]`
+(or `<generated wrapper script> [options]`).
 For a list of valid test types, see `test_runner.py --help`. For
 help on a specific test type, run `test_runner.py <test_type> --help`.
 
 The commands used by the buildbots are printed in the logs. Look at
 http://build.chromium.org/ to duplicate the same test command as a particular
 builder.
 
 If you build in an output directory other than "out", you may have to tell
 test\_runner.py where you place it. Say you build your android code in
 out\_android, then do `export CHROMIUM_OUT_DIR=out_android` before running the
 command below. You have to do this even if your "out" directory is a symlink
 pointing to "out_android". You can also use `--output-directory` to point to the
 path of your output directory, for example,
-`--output-directory=out_android/Debug`.
+`--output-directory=out_android/Debug`. (The generated wrapper scripts handle
+this automatically.)
 
 ## INSTALL\_FAILED\_CONTAINER\_ERROR or INSTALL\_FAILED\_INSUFFICIENT\_STORAGE
 
 If you see this error when test\_runner.py is attempting to deploy the test
 binaries to the AVD emulator, you may need to resize your userdata partition
 with the following commands:
 
 ```shell
 # Resize userdata partition to be 1G
 resize2fs android_emulator_sdk/sdk/system-images/android-23/x86/userdata.img 1G
@@ skipping 54 matching lines @@
 -f "org.chromium.chrome.browser.media.*"
 ```
 
 ## Gtests
 
 ```shell
 # Build a test suite
 ninja -C out/Release content_unittests_apk
 
 # Run a test suite
-build/android/test_runner.py gtest -s content_unittests --release -vvv
+out/Release/bin/run_content_unittests [-vv]
 
 # Run a subset of tests
-build/android/test_runner.py gtest -s content_unittests --release -vvv \
---gtest-filter ByteStreamTest.*
+out/Release/bin/run_content_unittests [-vv] --gtest-filter ByteStreamTest.*
 ```
 
 ## Instrumentation Tests
 
 In order to run instrumentation tests, you must leave your device screen ON and
 UNLOCKED. Otherwise, the test will timeout trying to launch an intent.
 Optionally you can disable screen lock under Settings -> Security -> Screen Lock
 -> None.
 
-Next, you need to build the app, build your tests, install the application APK,
-and then run your tests (which will install the test APK automatically).
+Next, you need to build the app, build your tests, and then run your tests
+(which will install the APK under test and the test APK automatically).
 
 Examples:
 
 ContentShell tests:
 
 ```shell
 # Build the code under test
 ninja -C out/Release content_shell_apk
 
 # Build the tests themselves
 ninja -C out/Release content_shell_test_apk
 
-# Install the code under test
-build/android/adb_install_apk.py out/Release/apks/ContentShell.apk
-
-# Run the test (will automagically install the test APK)
-build/android/test_runner.py instrumentation --test-apk=ContentShellTest \
---isolate-file-path content/content_shell_test_apk.isolate --release -vv
+# Run the test (will automagically install the APK under test and the test APK)
+out/Release/bin/run_content_shell_test_apk [-vv]
 ```
 
 ChromePublic tests:
 
 ```shell
 # Build the code under test
 ninja -C out/Release chrome_public_apk
 
 # Build the tests themselves
 ninja -C out/Release chrome_public_test_apk
 
-# Install the code under test
-build/android/adb_install_apk.py out/Release/apks/ChromePublic.apk
-
-# Run the test (will automagically install the test APK)
-build/android/test_runner.py instrumentation --test-apk=ChromePublicTest \
---isolate-file-path chrome/chrome_public_test_apk.isolate --release -vv
+# Run the test (will automagically install the APK under test and the test APK)
+out/Release/bin/run_chrome_public_test_apk [-vv]
 ```
 
 AndroidWebView tests:
 
 ```shell
 ninja -C out/Release android_webview_apk
 ninja -C out/Release android_webview_test_apk
-build/android/adb_install_apk.py out/Release/apks/AndroidWebView.apk \
-build/android/test_runner.py instrumentation --test-apk=AndroidWebViewTest \
---test_data webview:android_webview/test/data/device_files --release -vvv
+out/Release/bin/run_android_webview_test_apk [-vv]
 ```
 
-Use adb\_install\_apk.py to install the app under test, then run the test
-command. In order to run a subset of tests, use -f to filter based on test
+In order to run a subset of tests, use -f to filter based on test
 class/method or -A/-E to filter using annotations.
 
 Filtering examples:
 
 ```shell
 # Run a test suite
-build/android/test_runner.py instrumentation --test-apk=ContentShellTest
+out/Debug/bin/run_content_shell_test_apk
 
 # Run a specific test class
-build/android/test_runner.py instrumentation --test-apk=ContentShellTest -f \
-AddressDetectionTest
+out/Debug/bin/run_content_shell_test_apk -f AddressDetectionTest.*
 
 # Run a specific test method
-build/android/test_runner.py instrumentation --test-apk=ContentShellTest -f \
+out/Debug/bin/run_content_shell_test_apk -f \
 AddressDetectionTest#testAddressLimits
 
 # Run a subset of tests by size (Smoke, SmallTest, MediumTest, LargeTest,
 # EnormousTest)
-build/android/test_runner.py instrumentation --test-apk=ContentShellTest -A \
-Smoke
+out/Debug/bin/run_content_shell_test_apk -A Smoke
 
 # Run a subset of tests by annotation, such as filtering by Feature
-build/android/test_runner.py instrumentation --test-apk=ContentShellTest -A \
-Feature=Navigation
+out/Debug/bin/run_content_shell_test_apk -A Feature=Navigation
 ```
 
 You might want to add stars `*` to each as a regular expression, e.g.
 `*`AddressDetectionTest`*`
 
 ## Running Blink Layout Tests
 
 See
 https://sites.google.com/a/chromium.org/dev/developers/testing/webkit-layout-tests
 
 ## Running GPU tests
 
 (e.g. the "Android Debug (Nexus 7)" bot on the chromium.gpu waterfall)
 
 See http://www.chromium.org/developers/testing/gpu-testing for details. Use
 --browser=android-content-shell. Examine the stdio from the test invocation on
 the bots to see arguments to pass to src/content/test/gpu/run\_gpu\_test.py.