Merge "Update SELinux JNI to use helpers"