Merge "Fix SELinux labeling for system.img"