am 7c5bf466: consolidating to only use one surface per plugin. give plugin access to java context.

Merge commit '7c5bf466' into eclair-mr2-plus-aosp

* commit '7c5bf466':
  consolidating to only use one surface per plugin. give plugin access to java context.