am b35e113c: (-s ours) am 2d81c413: am d9af3ac3: (-s ours) Merge "Delete browserplugin sample. do not merge"

* commit 'b35e113cef040b9e8c8907341a2f94e420f7d108':
  Delete browserplugin sample. do not merge