am 606fe528: Merge change Ib4a23918 into eclair-mr2

Merge commit '606fe5281d830a6f4eb7ba36bf7127eb3b8cd934' into eclair-mr2-plus-aosp

* commit '606fe5281d830a6f4eb7ba36bf7127eb3b8cd934':
  Updating sample plugin to test java class loading.