Merge "Update RenderScript C++ API"