am ffacbc34: am fd2f6358: Merge change I771bebb9 into eclair

Merge commit 'ffacbc3419825ec1c786dd3c27f3e2a8cd071d8f' into eclair-mr2-plus-aosp

* commit 'ffacbc3419825ec1c786dd3c27f3e2a8cd071d8f':
  Add Java exceptions to catch RS calls with no context or no surface.