Merge change 24203 into eclair

* changes:
  Updating samplePlugin to use java surface views.