Merge change 24200 into eclair

* changes:
  First pass at replacing native plugin views with java.