Merge "Update RenderScript JNI code for Treble" am: 9017b25631
am: 76535e8888

Change-Id: I04dc6154e0c919a2a2c2c150b6877538b4e8da0a