Reland "Android: Moves InterstitialPageDelegateAndroid to test"

The new dependency content_java_test_support added to
chrome_public_apk_for_test inadvertently pushed
BaseChromiumAndroidJUnitRunner to secondary dex, which
made some buildbots fail to work. This CL relands the culprit
CL after annotating the class with @MainDex to make it stay
in the main dex.

Locally tested with Nexus 5 with the build version KTU84P.

TBR=boliu@chromium.org,tedchoc@chromium.org

Bug: 617324

This reverts commit a4b7fec80296a5e142fd99503ae8715ad7589ba0.

Change-Id: I483fa72dd7fa76a73fc2d9994243102cb06c6a46
Reviewed-on: https://chromium-review.googlesource.com/1053046
Reviewed-by: John Budorick <jbudorick@chromium.org>
Reviewed-by: Jinsuk Kim <jinsukkim@chromium.org>
Commit-Queue: Jinsuk Kim <jinsukkim@chromium.org>
Cr-Commit-Position: refs/heads/master@{#558949}

CrOS-Libchrome-Original-Commit: 7ff0db5ce04a795c9aa2daf52340ff5a64b569fb
1 file changed
tree: ca4faab5f547aefb14d48aee7b8d9d916dc13017
  1. base/
  2. build/
  3. components/
  4. dbus/
  5. device/
  6. ipc/
  7. mojo/
  8. testing/
  9. third_party/
  10. ui/