Merge "Reland "Neverallow vendor code access to files on /system.""