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