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

Merge commit 'd55aa75138cb3305e1aeb6fb4873851435462f2f'

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