Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-master

Note that the api/9.xml change is removing APIs that were removed going from RI 5 to RI 6

Change-Id: I665a30c4fdc2ca73c3ade0ad7487aa85cebf272f
4 files changed