Merge change 8279

* changes:
  Move the java and jni renderscript files to the proper location.