Merge "app.te: prevent locks of files on /system"