Merge change 2813 into donut

* changes:
  Remove the jni-tips.html document. It contains too many swear words :-)