Merge change 2501

* changes:
  Fix RenderScript JNI code build issue.