Merge change 20413

* changes:
  updating the sample plugin to reflect the latest changes in android_npapi.h