roomservice.py: Fixups around fallback branches not being used by dependencies when ROOMSERVICE_BRANCHES is defined.

Change-Id: Ifb42a023cae5f62ac8f9cf7832125b91b431169c
Merge remote branch 'cm/cm-10.1'
Some changes added to compile and run with Java 6 and Java 7.

  - correction of errors with Javac 6:
    - target 1.5 and source empty.
  - correction of errors with Javadoc 7:
    - strange behavior when duplicate classes are given.

Change-Id: Ib814ede143f7799ef18e0fb1b733547519b8b0e5
Merge remote branch 'cm/cm-10.1'
envsetup: Fix $PROMPT_COMMAND

Change I200902f135d0c5c620a8eb3ce9cefdba318cf9d3 broke the android
PROMPT_COMMAND on scenarios where the existing prompt already had
a hardstatus adjustment, since appending it to Android's just clobbered
Android's in favor of the original.

So instead of appending them, inject android's at the beggining of the
existing one (and create a default if none exists)

Change-Id: I1fbcbfdb6220d886dda3662da498d1759a4c195b
Merge remote branch 'cm/cm-10.1'
envsetup: Really fix PROMPT_COMMAND handling

 * Add ANDROID_NO_PROMPT_COMMAND to not change it at all.
 * Export ANDROID_PROMPT_PREFIX so it can be used elsewhere.

Change-Id: Ib2a487404d3b8a367a21582e8a0ce69c2d212a9a
Merge remote branch 'cm/cm-10.1'
Add githubssh() function

To add remote ssh://github, run githubssh in a project.

Change-Id: I154875f9e31c367d84ea08168dbb045bd1f78075
Add updatenotes and updateallnotes functions to envsetup

To update all review notes, call updateallnotes
To update a project's review notes, cd PROJECT and call updatenotes

Change-Id: I67485cbfe48c5ffb684ae23697b24a21f3a6c6b0
Merge github.com:androidarmv6/android_build into 10.1