Merge "Added jni and SurfaceControl methods for native setColor"