Merge pull request #10329 from PEmu2/andset

Update Android setup doc

AndroidSetup.md

@@ -4,11 +4,11 @@ If you'd like to contribute to the Android project, but do not currently have a
 
 ## Prerequisites
 
-* [Android Studio](http://developer.android.com/tools/studio/index.html)
+* [Android Studio](https://developer.android.com/studio/)
 
-If you downloaded Android Studio, extract it and then see [Setting up Android Studio](#setting-up-android-studio).
+If you downloaded Android Studio, extract it and then see [Setting Up Android Studio](#setting-up-android-studio).
 
-## Setting up Android Studio
+## Setting Up Android Studio
 
 1. Launch Android Studio, which will start a first-launch wizard.
 2. Choose a custom installation.
@@ -17,7 +17,7 @@ If you downloaded Android Studio, extract it and then see [Setting up Android St
 5. Accept all licenses, and click Finish. Android Studio will download the SDK Tools package automatically. (Ubuntu users, if you get an error running the `mksdcard` tool, make sure the `lib32stdc++6` package is installed.)
 6. At the Android Studio welcome screen, click "Configure", then "SDK Manager".
 7. Use the SDK Manager to get necessary dependencies, as described in [Getting Dependencies](#getting-dependencies).
-8. When done, follow the steps in [Readme.md](Readme.md#installation-on-android) to compile and deploy the application.
+8. When done, follow the steps in [Readme.md](Readme.md#building-for-android) to compile and deploy the application.
 
 ## Executing Gradle Tasks
 
@@ -39,10 +39,10 @@ Most dependencies for the Android project are supplied by Gradle automatically.
 
 1. Launch the Android SDK Manager by clicking on its icon in Android Studio's main toolbar:
 ![Android Studio Package Icon][package-icon]
-2. Install or update the SDK Platform. Choose the API level selected as [compileSdkVersion](Source/Android/app/build.gradle#L5).
-3. Install or update the SDK Tools. CMake, LLDB and NDK. If you don't use android-studio, please check out https://github.com/Commit451/android-cmake-installer.
+2. Install or update the SDK Platform. Choose the API level selected as [compileSdkVersion](Source/Android/app/build.gradle#L4).
+3. Install or update the SDK Tools. CMake, LLDB, and NDK. If you don't use android-studio, please check out https://github.com/Commit451/android-cmake-installer.
 
-In the future, if the project targets a newer version of Android, or use newer versions of the tools/build-tools packages, it will be necessary to use this tool to download updates.
+In the future, if the project targets a newer version of Android, or uses newer versions of the tools/build-tools packages, it will be necessary to use this tool to download updates.
 
 [components]: http://i.imgur.com/Oo1Fs93.png
 [package-icon]: http://i.imgur.com/NUpkAH8.png