Update Android build to API level 17 and SDK Tools version 21

chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java
index 0a29bd7bde14851d78f895ac7e05a87f1e1606d6..e9113a1e632b372fab94ef045b1e692cdf9ce69d 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java
@@ -185,7 +185,7 @@ public class ModalDialogTest extends ChromiumTestShellTestBase {
         JavascriptAppModalDialog jsDialog = getCurrentDialog();
         assertNotNull("No dialog showing.", jsDialog);
         checkButtonPresenceVisibilityText(
-                jsDialog, 0, org.chromium.content.R.string.stay_on_this_page,
+                jsDialog, 0, org.chromium.chrome.R.string.stay_on_this_page,
                 "Stay on this page");
         clickCancel(jsDialog);
 
@@ -195,7 +195,7 @@ public class ModalDialogTest extends ChromiumTestShellTestBase {
         jsDialog = getCurrentDialog();
         assertNotNull("No dialog showing.", jsDialog);
         checkButtonPresenceVisibilityText(
-                jsDialog, 2, org.chromium.content.R.string.leave_this_page,
+                jsDialog, 2, org.chromium.chrome.R.string.leave_this_page,
                 "Leave this page");
 
         final TestCallbackHelperContainer.OnPageFinishedHelper onPageLoaded =
@@ -221,10 +221,10 @@ public class ModalDialogTest extends ChromiumTestShellTestBase {
         assertNotNull("No dialog showing.", jsDialog);
 
         checkButtonPresenceVisibilityText(
-                jsDialog, 0, org.chromium.content.R.string.dont_reload_this_page,
+                jsDialog, 0, org.chromium.chrome.R.string.dont_reload_this_page,
                 "Don't reload this page");
         checkButtonPresenceVisibilityText(
-                jsDialog, 2, org.chromium.content.R.string.reload_this_page,
+                jsDialog, 2, org.chromium.chrome.R.string.reload_this_page,
                 "Reload this page");
     }