Merge "Update RenderScript JNI code for Treble"