Merge "init: fix subcontext SELinux strings" am: 60bd9ca592
am: 71b2c17ba7

Change-Id: Ie045bb09b723523fc7f66614268687edc4a85156