Merge "Set persistent property for SELinux enforcement on update." into jb-mr2-dev