navigator: show android pane before scope pane

Fixes https://code.google.com/p/android/issues/detail?id=74678

Change-Id: I2fda607414e742690ddd9afd41408d19858b69d3
(cherry picked from commit c21756ebe8eece7ddb426143cafe44ae5277d765)
Merge "navigator: show android pane before scope pane"
Add IDEA library for google-api-java-client

Change-Id: I2fd90b8f05128977aa87862d20835722396f83e9
(cherry picked from commit d741cf14b159a479a6a9cfd3634c34e14874bed1)
Merge "Add IDEA library for google-api-java-client"
Update google tools (cloud/login) build files

Change-Id: I2c0bb0f9a3494f0474a373e562d6b162ae5851be
Merge "Update google tools (cloud/login) build files"
Merge remote-tracking branch 'aosp/upstream-master' into merge

Conflicts:
	.idea/modules.xml
	build/scripts/tests.gant

Change-Id: I9a1fe25b61f1004e0f62419a5f64e1452644b784
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Remove defunct library gradle-import

Change-Id: Ice92249f71d1ca204883632355a40af06bb0f183
(cherry picked from commit 3f0387e9d0d7b8e42af19444bdb5dfd8604003e7)
Merge "Remove defunct library gradle-import"
Merge remote-tracking branch 'aosp/upstream-master' into merge

Conflicts:
	.idea/modules.xml
	platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java

Change-Id: Id899dae9a1e1c79272f8a70e14a7dcef4f760d7f
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Snapshot idea/138.1503 from git://git.jetbrains.org/idea/community.git

Change-Id: Ie01af1d8710ec0ff51d90301bda1a18b0b5c0faf
Snapshot idea/138.1696 from git://git.jetbrains.org/idea/community.git

Change-Id: I50c97b83a815ce635e49a38380ba5b8765e4b16a
Snapshot idea/138.1980 from git://git.jetbrains.org/idea/community.git

Change-Id: Ib567c9c152d770212a7a3db20fbf591c210920bd
Merge remote-tracking branch 'aosp/upstream-master' into merge
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Don't run inspections in extracted AAR folders

Most "outputs" (such as build/intermediates/) are marked as generated
source roots, which means IntelliJ won't scan those folders for
warnings.

However, AAR libraries are extracted into special build folders
(currently build/intermediates/exploded-aar) which are *not* marked as
generated; that's necessary such that those folders are scanned (for
indexing purposes), handled as potential go-to-declaration targets
(since resource files there can contain for example themes extended in
the user's application). Therefore, by default, IntelliJ will analyze
all the files in the exploded AAR folders. When you have large
libraries like appcompat or play services, this not only takes a lot
of extra time to analyze. You also end up with a lot of errors in
files you can't edit. For example, with appcompat, you end up with
over 700 spelling mistake warnings, and with play services, you end up
with over a hundred unused namespace warnings, and over a hundred tag
has no children warnings!

Therefore, this CL tweaks the batch analysis runner which iterates
over PSI files to skip files that are found to be within an AAR
folder. This removes all the false positives and speeds up code
analysis quite significantly!

Change-Id: I3dfdd663689a9d75de0318b03e5c4d8c3c6c30f6
(cherry picked from commit 771f728d65f218292649115c1130de00b8c37ec4)
Merge "Don't run inspections in extracted AAR folders"
Don't suggest making activities/fragments private

If you run Analyze > Inspect Code... on a default Android project,
you'll end up with suggestions that you should make your various
activities and services package protected (since they may not be
referenced from other code in the project). However, you can't do that
- at runtime the various inflaters will throw exceptions if you do.

This CL adds knowledge to the class analyzer in IntelliJ such that
it's aware of the Android context classes and does not suggest
reducing visibility of these.

Change-Id: Ib5e7004dba8b66b6541be87f121195453568822a

Conflicts:
	java/java-impl/src/com/intellij/codeInspection/reference/RefJavaManagerImpl.java