Merge "Fix some JNI issues in the drm framework"