- merge: "nandroid: Convert selinux_android_restorecon calls to new API" from @kumajaya