Merge "app.te: prevent locks of files on /system" am: cc45b87cfa
am: 6fcbd0f542

Change-Id: Ibc6947686cc6edf439e25cda9aaf5b1444da6c8c